* [PR PATCH] blender: musl disable lzma affinity
@ 2024-12-16 12:28 zlice
2024-12-17 12:03 ` ahesford
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: zlice @ 2024-12-16 12:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 719 bytes --]
There is a new pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 927 bytes --]
From 2059b995ceab30c5e8b4e9cb3e61d59bb4ccafbd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH] blender: musl disable lzma affinity
---
srcpkgs/blender/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..a551f9cf1d9233 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,8 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
else
makedepends+=" jemalloc-devel"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
@ 2024-12-17 12:03 ` ahesford
2024-12-17 12:55 ` zlice
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2024-12-17 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#issuecomment-2548276375
Comment:
Can you also fix the patch I pulled from Alpine by limiting the execinfo change to not-glibc only, or else get this package building on musl with `libexecinfo`?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
2024-12-17 12:03 ` ahesford
@ 2024-12-17 12:55 ` zlice
2024-12-17 13:23 ` [PR PATCH] [Updated] blender: musl disable lzma affinity [ci skip] zlice
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-17 12:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#issuecomment-2548387980
Comment:
Ya I can add the glibc def. I'll try to build once repos are updated.
I'll make another PR for gzdoom since it's doing the same lzma affinity thing.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] blender: musl disable lzma affinity [ci skip]
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
2024-12-17 12:03 ` ahesford
2024-12-17 12:55 ` zlice
@ 2024-12-17 13:23 ` zlice
2024-12-17 13:31 ` zlice
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-17 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity [ci skip]
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 1998 bytes --]
From 2059b995ceab30c5e8b4e9cb3e61d59bb4ccafbd Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH 1/2] blender: musl disable lzma affinity
---
srcpkgs/blender/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..a551f9cf1d9233 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,8 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
else
makedepends+=" jemalloc-devel"
fi
From 8f5d21cf5eeb2abd52ef101896116adefffba9ac Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 17 Dec 2024 08:00:54 -0500
Subject: [PATCH 2/2] blender: fix musl patches
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 847f369cb304bb..bd8d03ded06282 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -11,14 +11,13 @@ diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325..946095a 100644
--- a/extern/glog/src/config_linux.h
+++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,9 @@
#define HAVE_DLFCN_H
-
+
/* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
-
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H
++#endif
+
/* Define if you have the `fcntl' function */
#define HAVE_FCNTL
---
-2.47.0
-
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: blender: musl disable lzma affinity [ci skip]
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (2 preceding siblings ...)
2024-12-17 13:23 ` [PR PATCH] [Updated] blender: musl disable lzma affinity [ci skip] zlice
@ 2024-12-17 13:31 ` zlice
2024-12-17 13:33 ` zlice
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-17 13:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#issuecomment-2548387980
Comment:
Ya I can add the glibc def. I'll try to build once repos are updated.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: blender: musl disable lzma affinity [ci skip]
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (3 preceding siblings ...)
2024-12-17 13:31 ` zlice
@ 2024-12-17 13:33 ` zlice
2024-12-18 18:56 ` [PR PATCH] [Updated] " zlice
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-17 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#issuecomment-2548387980
Comment:
Ya I can add the glibc def. I'll try to build once repos are updated.
I'll remove the gzdoom patch too, looks like it already has the affinity disable flag.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] blender: musl disable lzma affinity [ci skip]
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (4 preceding siblings ...)
2024-12-17 13:33 ` zlice
@ 2024-12-18 18:56 ` zlice
2024-12-19 12:54 ` [PR PATCH] [Updated] blender: musl disable lzma affinity zlice
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-18 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity [ci skip]
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 2474 bytes --]
From 6381d5ac8e18759924c74a7d6cd26870fdd47ff3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH 1/2] blender: musl disable lzma affinity
---
srcpkgs/blender/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..a551f9cf1d9233 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,8 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
else
makedepends+=" jemalloc-devel"
fi
From 9359ac2781b6428a1cd5904a581e394267d1a5fe Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 17 Dec 2024 08:00:54 -0500
Subject: [PATCH 2/2] blender: fix musl patches
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 13 ++++++-------
srcpkgs/blender/template | 2 ++
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 847f369cb304bb..bd8d03ded06282 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -11,14 +11,13 @@ diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325..946095a 100644
--- a/extern/glog/src/config_linux.h
+++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,9 @@
#define HAVE_DLFCN_H
-
+
/* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
-
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H
++#endif
+
/* Define if you have the `fcntl' function */
#define HAVE_FCNTL
---
-2.47.0
-
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a551f9cf1d9233..bc5e3b59935052 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -41,6 +41,8 @@ make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
CFLAGS+=" -DZ7_AFFINITY_DISABLE"
CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS+=" -lexecinfo"
else
makedepends+=" jemalloc-devel"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (5 preceding siblings ...)
2024-12-18 18:56 ` [PR PATCH] [Updated] " zlice
@ 2024-12-19 12:54 ` zlice
2024-12-24 18:38 ` classabbyamp
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2024-12-19 12:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
built for **x86_64-musl** - repos still updating for x86_64
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 2474 bytes --]
From 6c08cf4cc5d419d21c8d010087e542c7b1464c89 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH 1/2] blender: musl disable lzma affinity
---
srcpkgs/blender/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..a551f9cf1d9233 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,8 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
else
makedepends+=" jemalloc-devel"
fi
From 3e0e9c68caee58274b32c634a0d3a4028453facb Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 17 Dec 2024 08:00:54 -0500
Subject: [PATCH 2/2] blender: fix musl patches
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 13 ++++++-------
srcpkgs/blender/template | 2 ++
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 847f369cb304bb..bd8d03ded06282 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -11,14 +11,13 @@ diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325..946095a 100644
--- a/extern/glog/src/config_linux.h
+++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,9 @@
#define HAVE_DLFCN_H
-
+
/* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
-
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H
++#endif
+
/* Define if you have the `fcntl' function */
#define HAVE_FCNTL
---
-2.47.0
-
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index a551f9cf1d9233..bc5e3b59935052 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -41,6 +41,8 @@ make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
CFLAGS+=" -DZ7_AFFINITY_DISABLE"
CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS+=" -lexecinfo"
else
makedepends+=" jemalloc-devel"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (6 preceding siblings ...)
2024-12-19 12:54 ` [PR PATCH] [Updated] blender: musl disable lzma affinity zlice
@ 2024-12-24 18:38 ` classabbyamp
2025-01-29 12:53 ` [PR PATCH] [Updated] " zlice
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2024-12-24 18:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#issuecomment-2561342589
Comment:
squash please
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (7 preceding siblings ...)
2024-12-24 18:38 ` classabbyamp
@ 2025-01-29 12:53 ` zlice
2025-01-29 12:58 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2025-01-29 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
built for **x86_64-musl** - repos still updating for x86_64
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 1837 bytes --]
From 8da749a30734d1c45c3f1edb0ae68796dcd0679a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH] blender: musl disable lzma affinity
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 13 ++++++-------
srcpkgs/blender/template | 7 +++++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
index 847f369cb304bb..bd8d03ded06282 100644
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ b/srcpkgs/blender/patches/0001-musl-fixes.patch
@@ -11,14 +11,13 @@ diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325..946095a 100644
--- a/extern/glog/src/config_linux.h
+++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,9 @@
#define HAVE_DLFCN_H
-
+
/* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
-
++#ifdef __GLIBC__
+ #define HAVE_EXECINFO_H
++#endif
+
/* Define if you have the `fcntl' function */
#define HAVE_FCNTL
---
-2.47.0
-
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..bc5e3b59935052 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,10 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS+=" -lexecinfo"
else
makedepends+=" jemalloc-devel"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR REVIEW] blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (8 preceding siblings ...)
2025-01-29 12:53 ` [PR PATCH] [Updated] " zlice
@ 2025-01-29 12:58 ` classabbyamp
2025-01-29 13:22 ` [PR PATCH] [Updated] " zlice
2025-02-11 13:58 ` [PR PATCH] [Merged]: " classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2025-01-29 12:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/53533#discussion_r1933833605
Comment:
what's the point of this patch if you add libexecinfo on musl anyways?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (9 preceding siblings ...)
2025-01-29 12:58 ` [PR REVIEW] " classabbyamp
@ 2025-01-29 13:22 ` zlice
2025-02-11 13:58 ` [PR PATCH] [Merged]: " classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: zlice @ 2025-01-29 13:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
There is an updated pull request by zlice against master on the void-packages repository
https://github.com/zlice/void-packages blender-lzma
https://github.com/void-linux/void-packages/pull/53533
blender: musl disable lzma affinity
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
built for **x86_64-musl** - repos still updating for x86_64
A patch file from https://github.com/void-linux/void-packages/pull/53533.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-lzma-53533.patch --]
[-- Type: text/x-diff, Size: 2066 bytes --]
From 5c4e593a2db5d3a32aae85c7e66c0bf0dfcb41c9 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 16 Dec 2024 07:08:25 -0500
Subject: [PATCH] blender: musl disable lzma affinity
---
srcpkgs/blender/patches/0001-musl-fixes.patch | 24 -------------------
srcpkgs/blender/template | 7 ++++--
2 files changed, 5 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/blender/patches/0001-musl-fixes.patch
diff --git a/srcpkgs/blender/patches/0001-musl-fixes.patch b/srcpkgs/blender/patches/0001-musl-fixes.patch
deleted file mode 100644
index 847f369cb304bb..00000000000000
--- a/srcpkgs/blender/patches/0001-musl-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8ad26a05598810b9d64722ac48507c145b010e30 Mon Sep 17 00:00:00 2001
-From: Leon Marz <main@lmarz.org>
-Date: Wed, 7 Dec 2022 21:18:58 +0100
-Subject: [PATCH 1/2] musl fixes
-
----
- extern/glog/src/config_linux.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/extern/glog/src/config_linux.h b/extern/glog/src/config_linux.h
-index b3a3325..946095a 100644
---- a/extern/glog/src/config_linux.h
-+++ b/extern/glog/src/config_linux.h
-@@ -14,7 +14,6 @@
- #define HAVE_DLFCN_H
-
- /* Define to 1 if you have the <execinfo.h> header file. */
--#define HAVE_EXECINFO_H
-
- /* Define if you have the `fcntl' function */
- #define HAVE_FCNTL
---
-2.47.0
-
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 8aec56d4083906..bc5e3b59935052 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=4.3.1
-revision=1
+revision=2
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -39,7 +39,10 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
make_check=no
if [ "$XBPS_TARGET_LIBC" = musl ]; then
- configure_args+=" -DWITH_LZMA=OFF"
+ CFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
+ makedepends+=" libexecinfo-devel"
+ LDFLAGS+=" -lexecinfo"
else
makedepends+=" jemalloc-devel"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: blender: musl disable lzma affinity
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
` (10 preceding siblings ...)
2025-01-29 13:22 ` [PR PATCH] [Updated] " zlice
@ 2025-02-11 13:58 ` classabbyamp
11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2025-02-11 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
There's a merged pull request on the void-packages repository
blender: musl disable lzma affinity
https://github.com/void-linux/void-packages/pull/53533
Description:
@ahesford @Calandracas606
Per convo https://github.com/void-linux/void-packages/pull/52903#pullrequestreview-2503902213 yesterday. Setting a flag for `DZ7_AFFINITY_DISABLE` is what 7zip does for musl. Probably the best thing to do here instead of disabling lzma entirely.
Build did not get to blender since the repos aren't updated and it's rebuilding everything from python to boost to meson
built for **x86_64-musl** - repos still updating for x86_64
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2025-02-11 13:58 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-16 12:28 [PR PATCH] blender: musl disable lzma affinity zlice
2024-12-17 12:03 ` ahesford
2024-12-17 12:55 ` zlice
2024-12-17 13:23 ` [PR PATCH] [Updated] blender: musl disable lzma affinity [ci skip] zlice
2024-12-17 13:31 ` zlice
2024-12-17 13:33 ` zlice
2024-12-18 18:56 ` [PR PATCH] [Updated] " zlice
2024-12-19 12:54 ` [PR PATCH] [Updated] blender: musl disable lzma affinity zlice
2024-12-24 18:38 ` classabbyamp
2025-01-29 12:53 ` [PR PATCH] [Updated] " zlice
2025-01-29 12:58 ` [PR REVIEW] " classabbyamp
2025-01-29 13:22 ` [PR PATCH] [Updated] " zlice
2025-02-11 13:58 ` [PR PATCH] [Merged]: " classabbyamp
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).