Re: gcc --static produces programs that crash
On Sat, 28 Nov 2020 12:45:10 +
Stuart Henderson wrote:
> On 2020/11/28 12:26, helmut karlowski wrote:
> > $ldd a.out
> > a.out:
> > StartEnd Type Open Ref GrpRef Name
> > 1a52f000 3a537000 exe 10 0 a.out
> > 0302c000 0302c000 ld.so 01 0 /usr/libexec/ld.so
>
> OpenBSD compilers use PIE by default, this is normal for a PIE binary.
OpenBSD doesn't use ld.so for static pie.
This diff might fix the problem. This diff was in one of my ports
trees, but I forgot about it. The diff was from j...@bitminer.ca in
"fix GCC 8.4.0 to unbreak -static linking" [1], except that this one
also edits patch-gcc_config_rs6000_openbsd_h for powerpc. I forget if
it works, so I will begin rechecking it.
[1] https://marc.info/?l=openbsd-ports=159967716702259=2
Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile14 Nov 2020 00:00:39 - 1.36
+++ Makefile30 Nov 2020 03:24:18 -
@@ -36,6 +36,8 @@ PKGNAME-objc = gobjc-${FULL_PKGVERSION}
PKGNAME-ada = gnat-${FULL_PKGVERSION}
PKGSPEC-main = gcc->=8,<9
+REVISION = 0
+
SHARED_LIBS = estdc++ 19.0 \
gfortran8.0 \
objc8.0 \
Index: patches/patch-gcc_config_aarch64_openbsd_h
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_aarch64_openbsd_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_config_aarch64_openbsd_h
--- patches/patch-gcc_config_aarch64_openbsd_h 20 May 2019 14:59:05 -
1.2
+++ patches/patch-gcc_config_aarch64_openbsd_h 30 Nov 2020 03:24:18 -
@@ -57,7 +57,7 @@ Index: gcc/config/aarch64/openbsd.h
+ %{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
+ %{assert*} \
-+ %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
++ %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker
/usr/libexec/ld.so}}} \
+ -L/usr/lib"
+
+#define OPENBSD_ENTRY_POINT "__start"
Index: patches/patch-gcc_config_alpha_openbsd_h
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_alpha_openbsd_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_config_alpha_openbsd_h
--- patches/patch-gcc_config_alpha_openbsd_h20 May 2019 14:59:05 -
1.2
+++ patches/patch-gcc_config_alpha_openbsd_h30 Nov 2020 03:24:18 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-gcc_config_alpha_openbsd
Index: gcc/config/alpha/openbsd.h
--- gcc/config/alpha/openbsd.h.orig
+++ gcc/config/alpha/openbsd.h
-@@ -19,6 +19,28 @@ along with GCC; see the file COPYING3. If not see
+@@ -19,6 +19,28 @@ along with GCC; see the file COPYING3.
/* Controlling the compilation driver. */
@@ -17,7 +17,7 @@ Index: gcc/config/alpha/openbsd.h
+ %{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
+ %{assert*} \
-+ %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
++ %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker
/usr/libexec/ld.so}}}"
+
+/* As an elf system, we need crtbegin/crtend stuff. */
+#undef STARTFILE_SPEC
@@ -31,7 +31,7 @@ Index: gcc/config/alpha/openbsd.h
/* run-time target specifications */
#define TARGET_OS_CPP_BUILTINS() \
do { \
-@@ -28,18 +50,27 @@ along with GCC; see the file COPYING3. If not see
+@@ -28,18 +50,27 @@ along with GCC; see the file COPYING3.
/* Layout of source language data types. */
@@ -54,9 +54,9 @@ Index: gcc/config/alpha/openbsd.h
#undef WCHAR_TYPE_SIZE
#define WCHAR_TYPE_SIZE 32
-+
+
+#undef WINT_TYPE
+#define WINT_TYPE "int"
-
++
#define LOCAL_LABEL_PREFIX"."
Index: patches/patch-gcc_config_arm_openbsd_h
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_arm_openbsd_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_config_arm_openbsd_h
--- patches/patch-gcc_config_arm_openbsd_h 20 May 2019 14:59:05 -
1.2
+++ patches/patch-gcc_config_arm_openbsd_h 30 Nov 2020 03:24:18 -
@@ -82,7 +82,7 @@ Index: gcc/config/arm/openbsd.h
+ %{!static:-Bdynamic} \
+ %{rdynamic:-export-dynamic} \
+ %{assert*} \
-+ %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
++ %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker
/usr/libexec/ld.so}}} \
+ %{!nostdlib:-L/usr/lib}"
+#endif
+
Index: patches/patch-gcc_config_i386_openbsdelf_h
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_openbsdelf_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gcc_config_i386_openbsdelf_h
--- patches/patch-gcc_config_i386_openbsdelf_h 8 Aug 2020 16:48:48 -
1.3
+++
Re: [macppc] lang/squeak/vm fix
On Sun, 29 Nov 2020 17:18:14 +0100
Charlene Wendling wrote:
> I've built and run squeak on macppc and amd64 without issues. '-O3'
> optimisation should be removed, but maybe it has not been removed in
> the past for a reason. The below diff also moves HOMEPAGE to https.
>
> It's OK cwen@, even though if '-O3' should be removed we're better
> off testing again.
I took cwen's diff, deleted -O3 -funroll-loops -mcpu=750, and changed
one patch comment (to "fix build on alpha, powerpc") to make the diff
below. ok gkoehler@ for my diff below, or for cwen's diff if we
decide to keep the flags.
-O3 -funroll-loops -mcpu=750 were only for powerpc (not powerpc64).
My diff and cwen's diff should behave the same on any other arch.
The flags might have been for gcc<=4.2.1 on Mac OS X:
-O3 overrides our -O2
-funroll-loops is the default in clang -O2
-mcpu=750 targets G3, oldest cpu for both Mac OS X and OpenBSD
-mno-fused-add existed in gcc but not in clang
clang -ffp-contract=on enables the fused multiply-add on powerpc (and
maybe arm64), but it is off by default in clang 10.
I built squeak/vm on macppc both with and without the flags (always
without -mno-fused-add), and observed no effect when I started squeak
with squeak/image and evaluated a few integer expressions.
I also want to comment on the mtfsf fix, which affects both powerpc
and powerpc64. "f0" in "mtfsf 0xff, f0" is Apple syntax. We use ELF
syntax, which is either "0" or "%%f0". The asm statement fails to
tell the compiler that f0 is clobbered, but luckily, I see no nearby
C code that might use f0. I would suggest something like,
__asm__ volatile("mtfsf 0xff, %0" : "f"(a_union.its_double));
but this old squeak 3.10.2 isn't worth the effort (current version
is squeak 5.3), so the simple "0" fix is ok with me.--George
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/squeak/Makefile.inc,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.inc
--- Makefile.inc12 Jul 2019 20:47:23 - 1.7
+++ Makefile.inc30 Nov 2020 00:48:23 -
@@ -8,7 +8,7 @@ MAINTAINER =Marc Espie http://minnow.cc.gatech.edu/squeak/159
PERMIT_PACKAGE = Yes
-HOMEPAGE = http://squeak.org/
+HOMEPAGE = https://squeak.org/
SQUEAK_SITE= http://ftp.squeak.org/${MAJOR}.${MINOR}/
MAJOR =3
Index: funsqueak/Makefile
===
RCS file: /cvs/ports/lang/squeak/funsqueak/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- funsqueak/Makefile 26 Mar 2020 19:55:08 - 1.4
+++ funsqueak/Makefile 30 Nov 2020 00:48:23 -
@@ -7,6 +7,7 @@ PKG_ARCH = *
DISTFILES =FunSqueak3.10alpha.7.zip
DISTNAME = squeak-funsqueak-3.10alpha7
+REVISION= 0
EPOCH =0
MASTER_SITES = ${SQUEAK_SITE}../various_images/FunSqueak/
RUN_DEPENDS = lang/squeak/vm>=3.10
Index: image/Makefile
===
RCS file: /cvs/ports/lang/squeak/image/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- image/Makefile 17 Nov 2010 08:05:18 - 1.7
+++ image/Makefile 30 Nov 2020 00:48:23 -
@@ -9,7 +9,7 @@ DOTV = 2
IMAGE_V = 7179
DISTFILES =Squeak$V.${DOTV}-${IMAGE_V}-basic.zip
DISTNAME = squeak-image-$V.${DOTV}.${IMAGE_V}
-REVISION = 0
+REVISION = 1
RUN_DEPENDS = lang/squeak/vm>=3.10
MASTER_SITES = ${SQUEAK_SITE}
EXTRACT_ONLY =
Index: sources/Makefile
===
RCS file: /cvs/ports/lang/squeak/sources/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- sources/Makefile23 Jul 2008 11:17:22 - 1.5
+++ sources/Makefile30 Nov 2020 00:48:23 -
@@ -9,6 +9,7 @@ NO_BUILD = Yes
DISTNAME = squeak-sources-${SOURCEV}
PKG_ARCH = *
MASTER_SITES = ${SQUEAK_SITE}
+REVISION= 0
do-install:
${INSTALL_DATA_DIR} ${SQUEAK_DIR}
Index: vm/Makefile
===
RCS file: /cvs/ports/lang/squeak/vm/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- vm/Makefile 11 Feb 2020 13:44:10 - 1.30
+++ vm/Makefile 30 Nov 2020 00:48:23 -
@@ -8,7 +8,7 @@ SRCV = 1
DISTFILES =Squeak-$V-${SRCV}.src.tar.gz
PKGNAME = squeak-vm-$V.${SRCV}
-REVISION = 10
+REVISION = 11
WRKDIST = ${WRKDIR}/Squeak-$V-${SRCV}
WRKSRC = ${WRKDIST}/platforms/unix/config
Index: vm/patches/patch-platforms_unix_config_Makefile_in
===
RCS file: vm/patches/patch-platforms_unix_config_Makefile_in
diff -N vm/patches/patch-platforms_unix_config_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ vm/patches/patch-platforms_unix_config_Makefile_in 30 Nov 2020 00:48:23
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index:
[Update] devel/tbb: 2020.2 -> 2020.3
The attached diff updates devel/tbb from 2020.2 to 2020.3.
The changelog can be viewed here:
https://github.com/oneapi-src/oneTBB/blob/v2020.3/CHANGES
I have tested tbb on amd64. configure, build, test, fake, package,
install and uninstall are all working.
I identified that both graphics/blender and geo/osrm-backend depend on
tbb. Both build and package sucessfully. I unfortunately don't know
enough about Blender to feel comfortable saying that nothing is broken,
so I've cc'ed the maintainer of that package as well in case they wish
to do their own testing.
Thanks.
diff --git a/devel/tbb/Makefile b/devel/tbb/Makefile
index 0992e022b2f..54dee5780d4 100644
--- a/devel/tbb/Makefile
+++ b/devel/tbb/Makefile
@@ -4,14 +4,14 @@ ONLY_FOR_ARCHS = ${CLANG_ARCHS}
COMMENT = threading building blocks
-V = 2020.2
+V = 2020.3
GH_ACCOUNT = oneapi-src
GH_PROJECT = oneTBB
GH_TAGNAME = v${V}
PKGNAME = tbb-${V}
-SHARED_LIBS += tbb 1.0 #2020.2
-SHARED_LIBS += tbbmalloc 1.0 #2020.2
+SHARED_LIBS += tbb 2.0 #2020.3
+SHARED_LIBS += tbbmalloc 2.0 #2020.3
CATEGORIES = devel
diff --git a/devel/tbb/distinfo b/devel/tbb/distinfo
index 7eed7d0b6e1..7f6a05c2e39 100644
--- a/devel/tbb/distinfo
+++ b/devel/tbb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (oneTBB-2020.2.tar.gz) = SAQyDh5svjpUIZl7UhmePBo4KbLstkiWQdpLjjL69QA=
-SIZE (oneTBB-2020.2.tar.gz) = 2637066
+SHA256 (oneTBB-2020.3.tar.gz) = 68T2qkeXLa7R979x0QCuW/aTHC4xRM8pnIzH0EHcovM=
+SIZE (oneTBB-2020.3.tar.gz) = 2639737
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mes...@cvs.openbsd.org 2020/11/29 14:45:26 Modified files: www/youtube-dl : Makefile distinfo Log message: update to youtube-dl 2020.11.29 tested by Ashton Fagg OK rsadowski@
Re: [new] productivity/py-epr-reader (terminal epub reader)
On Sun, Nov 29, 2020 at 03:09:27PM +0100, Solene Rapenne wrote: > This is a simple port of epr-reader generated by portgen. > I am not familiar with python ports but this one seems really simple. > I found it by DragonFly digest "lazy reading", there are not much > choice when it comes to epub viewer. > Kudos to Justin Sherrill for mentionning it. I'd just name it epr-reader, since it's not a library but a program to run. Then you can drop the PKGNAME line in the Makefile. Otherwise, it looks ok. OK kmos with those changes --Kurt
Re: 4 of 8 cores always idle on Ryzen 7 4750U Pro
Stuart Henderson writes: > On 2020/11/07 23:24, Ashton Fagg wrote (on bugs@): >> >> I'm running a Ryzen 4750U (8 cores, 16 with SMT). Obviously SMT >> being disabled means only 8 of them show up in htop and the >> like. However, I've noticed that 4 of my cores are always >> idle. They never, ever leave 0% usage no matter what I do - >> running stress tests, running make with -j8, doesn't matter, >> only 4 cores ever have usage >0. > > Does this help? Hi Stuart, Apologies for the belated reply. I just tested this on my Ryzen machine and can confirm that it does fix the issue with only half of the active cores being shown - screenshots attached. Tested with `stress -c 8` as in my original report. Thanks, Ash
Re: [UPDATE] www/youtube-dl to 2020.11.29
Ricardo Mestre writes: > Hi, > > Simple update to 2020.11.29, OK? I just tested this and it seems to work fine. Ash
Ping: Re: [New] sysutils/glances (Python)
Ping on this one.
Reviewer agreed version attached. Thanks.
glances.tgz
Description: Binary data
Ashton Fagg writes:
> Stuart Henderson writes:
>
>> OpenBSD uses ${SYSCONFDIR} (typically /etc) not /usr/local/etc for
>> config files, and they should be installed using @sample in PLIST so
>> that local edits don't break updates.
>>
>> The web interface (glances -w) requires py3-bottle, it's a small enough
>> dep so I think might as well just list in RUN_DEPENDS rather than write
>> a note in DESCR or a pkg-readme that people will ignore anyway.
>>
>> I also fixed whitespace nits (mix of "=" and " =") and put RUN_DEPENDS
>> in alpha order.
>>
>> It does do something odd with the naming of tmux processes though,
>> just shows them as "default)", not a show stopper for important but might
>> be worth poking at.
>>
>> This version is OK with me if someone wants to commit it..
>
> Thanks for the review, Stuart. I'll take a look at what's going on with
> the tmux processes.
>
> (also interest bump since I'm a few days late on replying - Stuart's
> fixed version attached)
Re: [New] devel/fmt
Jeremie Courreges-Anglas writes: > [...] > > I think the port as-is is ripe and ready to commit, but I don't know yet > if there are ports that might pick this up. > > [...] Just following up on this - if anyone is still interested in importing this new port, I have updated it to the latest version - 7.1.3 (vs 7.1.1). Tarball is attached. Tested the same way - builds, tests, fakes, packages, installs and deinstalls. Thanks, Ash fmt-7.1.3.tgz Description: Binary data
Re: [update] deve/py-llvmlite to 0.34.0
bump? both packages are building fine, llvmlite is working locally. I don't use py-miasm but as mentioned in my previous email, tests did work after install. Unfortunately, I am not going to be able to help clean up the patches as I am busy with schoolwork but wanted to give a reminder nonetheless. Best, Aisha
Re: [New] devel/flatbuffers
Marc Espie writes: > I don't have a kodi port yet... I've had it configure and start building, > but it's still missing pieces. > > one thing I can't figure out is why it doesn't pick up freebsd > defaults at all, even though I've mostly configured it to. Hello folks, Just wondering if anyone is still interesting in importing this port? Reviewer-agreed version attached from the previous discussions. Thanks, Ash flatbuffers.tgz Description: Binary data
Re: [New] devel/re2
Stuart Henderson writes:
> textproc would be just fine and is less full than devel
Fixed.
> : GH_ACCOUNT= google
> : GH_PROJECT= re2
> : GH_TAGNAME= 2020-11-01
> :
> : # This is needed because otherwise the package build pukes due to it
> : # not understanding the versioning convention.
> : PKGNAME=re2-${GH_TAGNAME:S,-,,g}
>
> the comment isn't needed, this situation is explicitly called out in
> packages-specs(7)
Fixed.
> :
> : SHARED_LIBS=re2 0.0
> :
> : MAINTAINER= Ashton Fagg
> :
> : # BSD
> : PERMIT_PACKAGE= Yes
> :
> : COMPILER= base-clang ports-gcc
> : MODULES=devel/cmake
> :
> : WANTLIB=${COMPILER_LIBCXX} m pthread
>
> please put wantlib in the standard place as in Makefile.template,
> when someone gets round to doing full wantlib syncs through the ports
> tree again it makes it easier to have that in the usual place
Fixed.
Update tarball attached. Sorry for the slow response.
Ash
re2.tgz
Description: Binary data
Re: 4 of 8 cores always idle on Ryzen 7 4750U Pro
On 2020/11/29 15:00, Ashton Fagg wrote:
> Stuart Henderson writes:
>
> > On 2020/11/07 23:24, Ashton Fagg wrote (on bugs@):
> >>
> >> I'm running a Ryzen 4750U (8 cores, 16 with SMT). Obviously SMT
> >>being disabled means only 8 of them show up in htop and the
> >>like. However, I've noticed that 4 of my cores are always
> >>idle. They never, ever leave 0% usage no matter what I do -
> >>running stress tests, running make with -j8, doesn't matter,
> >>only 4 cores ever have usage >0.
> >
> > Does this help?
>
> Hi Stuart,
>
> Apologies for the belated reply.
>
> I just tested this on my Ryzen machine and can confirm that it does fix
> the issue with only half of the active cores being shown - screenshots
> attached. Tested with `stress -c 8` as in my original report.
Thanks. I've just committed that.
Here's a diff on top to update to 3.0.2. Shouldn't be much in the way
of visible change but it gets rid of the Python build dependency.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/htop/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile29 Nov 2020 20:15:05 - 1.24
+++ Makefile29 Nov 2020 20:19:53 -
@@ -4,8 +4,7 @@ COMMENT = interactive process viewer
GH_ACCOUNT = htop-dev
GH_PROJECT = htop
-GH_TAGNAME = 3.0.1
-REVISION = 0
+GH_TAGNAME = 3.0.2
CATEGORIES = sysutils
@@ -18,7 +17,6 @@ PERMIT_PACKAGE = Yes
WANTLIB = c curses kvm m
-MODULES = lang/python
RUN_DEPENDS = devel/desktop-file-utils
NO_TEST = Yes
@@ -29,9 +27,6 @@ AUTOMAKE_VERSION =1.16
AUTORECONF = ./autogen.sh
CONFIGURE_ARGS += --disable-unicode \
--disable-taskstats
-
-MODPY_RUNDEP = No
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
# htop has some bugs which take hours or days to reach.
# Keep the symbols to give a chance to the user to get an useful coredump.
Index: distinfo
===
RCS file: /cvs/ports/sysutils/htop/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Sep 2020 17:25:21 - 1.5
+++ distinfo29 Nov 2020 20:19:53 -
@@ -1,2 +1,2 @@
-SHA256 (htop-3.0.1.tar.gz) = hGUWS8CF9fGBPh0/bEubVr9MlcwSImpTZ+ZXlJSbAco=
-SIZE (htop-3.0.1.tar.gz) = 179925
+SHA256 (htop-3.0.2.tar.gz) = tHRKO+onnyo3Je2OXjX/2csQ1mZzvwfI/iH+s8RmEwU=
+SIZE (htop-3.0.2.tar.gz) = 176132
Index: patches/patch-CPUMeter_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-CPUMeter_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-CPUMeter_c
--- patches/patch-CPUMeter_c21 Nov 2020 15:50:40 - 1.7
+++ patches/patch-CPUMeter_c29 Nov 2020 20:19:53 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CPUMeter_c,v 1.7 2020/11
Index: CPUMeter.c
--- CPUMeter.c.orig
+++ CPUMeter.c
-@@ -233,6 +233,10 @@ static void SingleColCPUsMeter_draw(Meter* this, int x
+@@ -202,6 +202,10 @@ static void SingleColCPUsMeter_draw(Meter* this, int x
int start, count;
AllCPUsMeter_getRange(this, , );
for (int i = 0; i < count; i++) {
Index: patches/patch-FunctionBar_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-FunctionBar_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-FunctionBar_c
--- patches/patch-FunctionBar_c 26 Jul 2018 12:49:04 - 1.3
+++ patches/patch-FunctionBar_c 29 Nov 2020 20:19:53 -
@@ -6,7 +6,7 @@ so we leak for now.
Index: FunctionBar.c
--- FunctionBar.c.orig
+++ FunctionBar.c
-@@ -72,14 +72,8 @@ FunctionBar* FunctionBar_new(const char* const* functi
+@@ -59,14 +59,8 @@ FunctionBar* FunctionBar_new(const char* const* functi
}
void FunctionBar_delete(FunctionBar* this) {
Index: patches/patch-Header_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-Header_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Header_c
--- patches/patch-Header_c 21 Nov 2020 15:50:40 - 1.2
+++ patches/patch-Header_c 29 Nov 2020 20:19:53 -
@@ -1,17 +1,15 @@
-$OpenBSD: patch-Header_c,v 1.2 2020/11/21 15:50:40 sthen Exp $
+$OpenBSD: patch-Header_c,v 1.2 2020/11/21 15:50:40 sthen Exp $
Index: Header.c
--- Header.c.orig
+++ Header.c
-@@ -192,8 +192,9 @@ void Header_draw(const Header* this) {
+@@ -168,7 +168,8 @@ void Header_draw(const Header* this) {
Header_forEachColumn(this, col) {
Vector* meters = this->columns[col];
for (int y = (pad / 2), i = 0; i < Vector_size(meters); i++) {
- Meter* meter = (Meter*) Vector_get(meters, i);
-- meter->draw(meter, x, y, width);
+ Meter* meter = (Meter*) Vector_get(meters, i);
+ if (meter == 0x1 || meter->draw == 0x1) continue;
-+ meter->draw(meter, x, y,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/29 13:15:05 Modified files: sysutils/htop : Makefile sysutils/htop/patches: patch-openbsd_OpenBSDProcessList_c Log message: htop: fix the patch that copes with disabled cores and hw.smt=0; it was storing cpuids in an array but not using them and just using the array index when looking up the stats. this works for cpus where the disabled smt "cpu"s are at the end of the list but not where disabled/enabled cores are interspersed as is the case with AMD. reported/tested by Ashton Fagg.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/29 13:08:49 Modified files: graphics : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm graphics/openjp2: Makefile graphics/openjp2/pkg: PLIST Removed files: graphics/openjpeg: Makefile distinfo graphics/openjpeg/patches: patch-applications_codec_convert_c patch-configure_ac patch-libopenjpeg_opj_malloc_h graphics/openjpeg/pkg: DESCR PLIST Log message: remove openjpeg, with the openimageio/blender updates it has no more consumers. merge into openjp2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/29 13:05:50 Modified files: graphics/openimageio: Makefile distinfo graphics/openimageio/patches: patch-src_cmake_platform_cmake patch-src_ffmpeg_imageio_ffmpeginput_cpp patch-src_include_tbb_machine_gcc_generic_h patch-src_include_tbb_machine_sunos_sparc_h patch-src_libtexture_texture_pvt_h patch-src_libutil_sysutil_cpp patch-src_make_detectplatform_mk graphics/openimageio/pkg: PLIST Removed files: graphics/openimageio/patches: patch-src_include_OpenImageIO_simd_h patch-src_libutil_simd_test_cpp Log message: update to openimageio-1.8.17 (the newest in 1.8 branch), from Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/29 12:57:01 Modified files: graphics/blender: Makefile distinfo graphics/blender/patches: patch-extern_glog_src_config_h patch-intern_cycles_util_util_aligned_malloc_cpp patch-intern_ffmpeg_ffmpeg_compat_h patch-intern_guardedalloc_intern_mallocn_c patch-intern_guardedalloc_intern_mallocn_guarded_impl_c patch-intern_guardedalloc_intern_mallocn_intern_h patch-intern_libmv_libmv_base_aligned_malloc_cc patch-intern_libmv_libmv_numeric_numeric_h patch-source_blender_blenkernel_intern_packedFile_c patch-source_blender_blenlib_intern_storage_c patch-source_blender_blenloader_intern_writefile_c graphics/blender/pkg: PLIST Added files: graphics/blender/patches: patch-extern_wcwidth_wcwidth_h patch-intern_cycles_CMakeLists_txt patch-release_scripts_startup_bl_ui_space_toolsystem_common_py patch-source_blender_blenlib_BLI_sys_types_h patch-source_blender_blenlib_intern_system_c patch-source_blender_blenloader_intern_readfile_h Removed files: graphics/blender/patches: patch-extern_carve_include_carve_geom_hpp patch-intern_audaspace_ffmpeg_AUD_FFMPEGReader_cpp patch-intern_audaspace_ffmpeg_AUD_FFMPEGWriter_cpp patch-intern_itasc_kdl_tree_hpp patch-intern_opensubdiv_opensubdiv_converter_cc patch-source_blender_blenkernel_intern_writeffmpeg_c patch-source_blender_imbuf_intern_indexer_c patch-source_blender_python_intern_bpy_rna_c patch-source_blender_render_intern_source_shadbuf_c patch-source_gameengine_Expressions_intern_InputParser_cpp Log message: update to blender-2.91.0, from Dimitri Karamazov (and earlier work on 2.81 from Andrea Fleckenstein). Dimitri takes maintainer, agreed with pascal@. I added a dep on graphics/potrace because blender picks it up at build time if present.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/29 12:08:14 Modified files: www/privoxy: Makefile distinfo www/privoxy/patches: patch-GNUmakefile_in patch-config www/privoxy/pkg: PLIST Log message: update to privoxy-3.0.29
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 11:53:50 Modified files: www/castor : Makefile www/castor/pkg : PLIST Log message: Fix icon installation path.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 11:48:16 Modified files: www: Makefile Log message: +castor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 11:47:49 Log message: Import castor-0.8.16 Castor is a graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols. ok robert@ Status: Vendor Tag: ajacoutot Release Tags: ajacoutot_20201129 N ports/www/castor/Makefile N ports/www/castor/distinfo N ports/www/castor/pkg/DESCR N ports/www/castor/pkg/PLIST No conflicts created by this import
[new] productivity/py-epr-reader (terminal epub reader)
This is a simple port of epr-reader generated by portgen. I am not familiar with python ports but this one seems really simple. I found it by DragonFly digest "lazy reading", there are not much choice when it comes to epub viewer. Kudos to Justin Sherrill for mentionning it. epr-reader is a terminal epub reader with a lot of features: > Terminal/CLI Epub reader with features: > > - Remembers last read file > - Remembers last reading state for each file > - Adjustable text area width > - Adaptive to terminal resize > - Supports EPUB3 (no audio support) > - Secondary vim-like bindings > - Supports opening images > - Dark/Light colorscheme ok? py-epr-reader.tar.gz Description: application/gzip
[UPDATE] www/youtube-dl to 2020.11.29
Hi,
Simple update to 2020.11.29, OK?
Index: Makefile
===
RCS file: /cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.217
diff -u -p -u -r1.217 Makefile
--- Makefile28 Nov 2020 08:15:39 - 1.217
+++ Makefile29 Nov 2020 16:54:18 -
@@ -2,7 +2,7 @@
COMMENT = CLI program to download videos from YouTube and other sites
-VERSION = 2020.11.26
+VERSION = 2020.11.29
MODPY_EGG_VERSION =${VERSION:S/.0/./g}
DISTNAME = youtube-dl-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.196
diff -u -p -u -r1.196 distinfo
--- distinfo28 Nov 2020 08:15:39 - 1.196
+++ distinfo29 Nov 2020 16:54:18 -
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2020.11.26.tar.gz) =
+xBs1g+U/gCv7kbU4CjNyo6/8XHd+p1P8qL9WVZYb38=
-SIZE (youtube-dl-2020.11.26.tar.gz) = 3218922
+SHA256 (youtube-dl-2020.11.29.tar.gz) =
5ii+hgPSj3ZVZkNd3iU7zcIlNcEgoHJg+5RwqS0v/YI=
+SIZE (youtube-dl-2020.11.29.tar.gz) = 3222467
Re: [macppc] lang/squeak/vm fix
Hi,
On Sun, 29 Nov 2020 11:02:35 +
Anthony Richardby wrote:
> On 2020-11-29 10:41:05 + Anthony Richardby
> wrote:
>
> > Hi All,
> > With this patch squeak-vm builds and runs on my macppc machine. I've
> > had to make 3 changes. I've removed the -mno-fused-madd which
> > doesn't seem to exist on clang. I've changed f0 to just 0 in the
> > powerpc specific inline asm, not sure about this, but I thought the
> > type of register was implicit anyway. Finally, and this change
> > affects all platforms, I had to change the order of linker
> > arguments; without this I got a bunch of linker errors relating to
> > the plugins. If there's anything else I need to do, let me know.
> >
> > I've only really tested it by clicking around in the default image,
> > which seems to function well, though I plan on having a play with
> > Squeak some more later.
> >
Thanks a lot! Your diff should also help fixing the build on other
ld.bfd archs.
Please always CC the port maintainer.
I've built and run squeak on macppc and amd64 without issues. '-O3'
optimisation should be removed, but maybe it has not been removed in
the past for a reason. The below diff also moves HOMEPAGE to https.
It's OK cwen@, even though if '-O3' should be removed we're better
off testing again.
Charlène.
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/squeak/Makefile.inc,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile.inc
--- Makefile.inc12 Jul 2019 20:47:23 - 1.7
+++ Makefile.inc29 Nov 2020 15:19:41 -
@@ -8,7 +8,7 @@ MAINTAINER =Marc Espie http://minnow.cc.gatech.edu/squeak/159
PERMIT_PACKAGE = Yes
-HOMEPAGE = http://squeak.org/
+HOMEPAGE = https://squeak.org/
SQUEAK_SITE= http://ftp.squeak.org/${MAJOR}.${MINOR}/
MAJOR =3
Index: funsqueak/Makefile
===
RCS file: /cvs/ports/lang/squeak/funsqueak/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- funsqueak/Makefile 26 Mar 2020 19:55:08 - 1.4
+++ funsqueak/Makefile 29 Nov 2020 15:19:41 -
@@ -7,6 +7,7 @@ PKG_ARCH = *
DISTFILES =FunSqueak3.10alpha.7.zip
DISTNAME = squeak-funsqueak-3.10alpha7
+REVISION= 0
EPOCH =0
MASTER_SITES = ${SQUEAK_SITE}../various_images/FunSqueak/
RUN_DEPENDS = lang/squeak/vm>=3.10
Index: image/Makefile
===
RCS file: /cvs/ports/lang/squeak/image/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- image/Makefile 17 Nov 2010 08:05:18 - 1.7
+++ image/Makefile 29 Nov 2020 15:19:41 -
@@ -9,7 +9,7 @@ DOTV = 2
IMAGE_V = 7179
DISTFILES =Squeak$V.${DOTV}-${IMAGE_V}-basic.zip
DISTNAME = squeak-image-$V.${DOTV}.${IMAGE_V}
-REVISION = 0
+REVISION = 1
RUN_DEPENDS = lang/squeak/vm>=3.10
MASTER_SITES = ${SQUEAK_SITE}
EXTRACT_ONLY =
Index: sources/Makefile
===
RCS file: /cvs/ports/lang/squeak/sources/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- sources/Makefile23 Jul 2008 11:17:22 - 1.5
+++ sources/Makefile29 Nov 2020 15:19:41 -
@@ -9,6 +9,7 @@ NO_BUILD = Yes
DISTNAME = squeak-sources-${SOURCEV}
PKG_ARCH = *
MASTER_SITES = ${SQUEAK_SITE}
+REVISION= 0
do-install:
${INSTALL_DATA_DIR} ${SQUEAK_DIR}
Index: vm/Makefile
===
RCS file: /cvs/ports/lang/squeak/vm/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- vm/Makefile 11 Feb 2020 13:44:10 - 1.30
+++ vm/Makefile 29 Nov 2020 15:19:41 -
@@ -8,7 +8,7 @@ SRCV = 1
DISTFILES =Squeak-$V-${SRCV}.src.tar.gz
PKGNAME = squeak-vm-$V.${SRCV}
-REVISION = 10
+REVISION = 11
WRKDIST = ${WRKDIR}/Squeak-$V-${SRCV}
WRKSRC = ${WRKDIST}/platforms/unix/config
Index: vm/patches/patch-platforms_unix_config_Makefile_in
===
RCS file: vm/patches/patch-platforms_unix_config_Makefile_in
diff -N vm/patches/patch-platforms_unix_config_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ vm/patches/patch-platforms_unix_config_Makefile_in 29 Nov 2020 15:19:41
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: platforms/unix/config/Makefile.in
+--- platforms/unix/config/Makefile.in.orig
platforms/unix/config/Makefile.in
+@@ -43,7 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak)
+ # VM
+
+ $(squeak) : config.sh $(SQLIBS) version.o
+- $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
++ $(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
+ @echo
+ @size $(squeak)
+ @echo
Index: vm/patches/patch-platforms_unix_config_acinclude_m4
Re: [New] cad/dxf2gcode 20191025
On Sun, Nov 22, 2020 at 10:47:26AM -0700, Tracey Emery wrote:
> On Sun, Nov 22, 2020 at 06:03:38PM +0100, Paco Esteban wrote:
> > Hi,
> >
> > On Thu, 12 Nov 2020, Tracey Emery wrote:
> >
> > > On Thu, Nov 12, 2020 at 05:17:02PM +, Stuart Henderson wrote:
> > > > On 2020/11/12 09:58, Tracey Emery wrote:
> > > > > Hello ports,
> > > > >
> > > > > Attached is a new port, cad/dxf2gcode.
> > > > >
> > > > > DXF2GCODE is a tool for converting 2D (dxf, pdf, ps) drawings to CNC
> > > > > machine compatible GCode.
> > > > >
> > > > > This port adds functionality to packages like qcad, for CNC millers
> > > > > like
> > > > > me, to be able to take a 2D project all the way to the CNC mill,
> > > > > instead
> > > > > of just print.
> > > > >
> > > > > The user can select each path and select all the drills, mills, and
> > > > > limits for that path.
> > > > >
> > > > > I've run this against a qcad created dxf on amd64 and the output gcode
> > > > > looks good to me. I haven't taken it to mill yet, well, since the
> > > > > project isn't ready. :D
> > > > >
> > > > > Comments? Ok to import?
> > > > >
> > > > > Thanks.
> > > > >
> > > > > --
> > > > >
> > > > > Tracey Emery
> > > >
> > > > Some of the plist entries look a bit problematic,
> > > >
> > > > lib/python${MODPY_VERSION}/site-packages/easy-install.pth
> > > > lib/python${MODPY_VERSION}/site-packages/site.py
> > > >
> > > > I'm not sure what to do with this off-hand though...
> > > >
> > > > Could you try something like this instead of patching for the -3 suffix
> > > > please? It will be easier to handle when we get rid of the py27 py-qt5.
> > > >
> > > > .for i in pyuic pyrcc pylupdate
> > > > ln -s ${LOCALBASE}/bin/$i5${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/$i5
> > > > .endfor
> > >
> > > Attached is a new port with your -3 workaround. Thanks.
> > >
> > > For easy-install.pth and site.py, I just commented them out in PLIST.
> > > The executable doesn't appear to need them in any way, as I was able to
> > > do everything I did in my first test.
> > >
> > > Any python people that can say if this is the right way to go about
> > > these two files? Otherwise, the only other way I can think to handle
> > > those is with:
> > >
> > > do-install:
> > > mkdir -p ${WRKINST}${MODPY_SITEPKG}/${DISTNAME}
> > > cd ${WRKSRC} && ${MAKE_ENV} \
> > > PYTHONPATH=${WRKINST}${MODPY_SITEPKG} ${MODPY_BIN} \
> > > ./st-setup.py install --prefix=${PREFIX}
> > > mv ${WRKINST}${MODPY_SITEPKG}/site.py \
> > > ${WRKINST}${MODPY_SITEPKG}/${DISTNAME}
> > > ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> > > ${WRKINST}${MODPY_SITEPKG}/${DISTNAME}/site.py
> > > mv ${WRKINST}${MODPY_SITEPKG}/easy-install.pth \
> > > ${WRKINST}${MODPY_SITEPKG}/${DISTNAME}
> > >
> > > Thoughts? Ok to import?
> >
> > Here's an updated version with another patch for the "sys.platform"
> > stuff. This makes the default folders on the configuration more unix
> > like.
>
> Ah, good catch. Thanks.
>
> >
> > I cannot find the "site.py" or "easy-install.pth" on my build, is this
> > maybe a build env problem ? (I had those in the past).
>
> Stu has some reservations about the location of those files, so I
> commented them out, as they don't appear to be needed by the resulting
> binary. There is an option to keep them above, but was waiting for
> py-people to comment on the proper course here. With the above
> do-install, they will be installed a proper directory. So, are they
> needed?
>
> I'm not a py-person, so I can't answer. I just want to use the software.
> :)
>
> >
> > For the rest, I tested it on amd64 and looks good to me. Unfortunately
> > I don't have any CNC handy to test, so I guess that's ok paco@
> >
> > Cheers,
> >
> > --
> > Paco Esteban.
> > 0x5818130B8A6DBC03
>
>
>
> --
>
> Tracey Emery
So, if no other py-folks chime in, I'm going to import this as is
tomorrow. Thanks.
--
Tracey Emery
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 08:03:59 Modified files: sysutils/consul/patches: patch-vendor_github_com_shirou_gopsutil_v3_process_process_openbsd_go Log message: Merged upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 06:37:06 Modified files: print/qpdf : Makefile distinfo Log message: Update to qpdf-10.0.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/11/29 05:59:25 Modified files: graphics/zint : Makefile distinfo graphics/zint/pkg: PLIST-main Log message: update to zint-2.9.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 04:33:31 Modified files: sysutils/consolekit/patches: patch-src_ck-inhibit-manager_c patch-src_ck-inhibit-manager_h patch-src_ck-inhibit_c patch-src_ck-inhibit_h patch-src_ck-sysdeps-openbsd_c patch-src_ck-sysdeps-unix_c Log message: All merged upstream.
Re: [macppc] lang/squeak/vm fix
On 2020-11-29 10:41:05 + Anthony Richardby wrote:
Hi All,
With this patch squeak-vm builds and runs on my macppc machine. I've
had to make 3 changes. I've removed the -mno-fused-madd which doesn't
seem to exist on clang. I've changed f0 to just 0 in the powerpc
specific inline asm, not sure about this, but I thought the type of
register was implicit anyway. Finally, and this change affects all
platforms, I had to change the order of linker arguments; without this
I got a bunch of linker errors relating to the plugins. If there's
anything else I need to do, let me know.
I've only really tested it by clicking around in the default image,
which seems to function well, though I plan on having a play with
Squeak some more later.
Index: patches/patch-platforms_unix_config_Makefile_in
===
RCS file: patches/patch-platforms_unix_config_Makefile_in
diff -N patches/patch-platforms_unix_config_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-platforms_unix_config_Makefile_in 29 Nov 2020
10:18:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: platforms/unix/config/Makefile.in
+--- platforms/unix/config/Makefile.in.orig
platforms/unix/config/Makefile.in
+@@ -43,7 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak)
+ # VM
+
+ $(squeak) : config.sh $(SQLIBS) version.o
+- $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
++ $(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
+ @echo
+ @size $(squeak)
+ @echo
Index: patches/patch-platforms_unix_config_acinclude_m4
===
RCS file:
/cvs/ports/lang/squeak/vm/patches/patch-platforms_unix_config_acinclude_m4,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-platforms_unix_config_acinclude_m4
--- patches/patch-platforms_unix_config_acinclude_m414 Jan 2020
22:20:29 - 1.1
+++ patches/patch-platforms_unix_config_acinclude_m429 Nov 2020
10:18:46 -
@@ -5,10 +5,20 @@ fix build on alpha
Index: platforms/unix/config/acinclude.m4
--- platforms/unix/config/acinclude.m4.orig
+++ platforms/unix/config/acinclude.m4
-@@ -255,16 +255,6 @@ fi)
+@@ -115,7 +115,7 @@ if test "$GCC" = yes; then
+ ac_optflags="-fomit-frame-pointer"
+ ;;
+ powerpc|ppc)
+-ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
++ac_optflags="-O3 -funroll-loops -mcpu=750"
+ ;;
+ esac
+ AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__"
Compiler: "__VERSION__])
+@@ -254,16 +254,6 @@ else ac_cv_module_prefix="lib"
+ fi)
AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix")
test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib])
-
+-
-AC_DEFUN([AC_64BIT_ARCH],
-[AC_MSG_CHECKING(for compiler flags to force 32-bit addresses)
-case $host in
@@ -18,7 +28,6 @@ Index: platforms/unix/config/acinclude.m
-;;
-esac
-AC_MSG_RESULT($CFLAGS_32)])
--
- ### plugin support
+ ### plugin support
Index:
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
===
RCS file:
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
diff -N
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4 29
Nov 2020 10:18:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: platforms/unix/plugins/FloatMathPlugin/acinclude.m4
+--- platforms/unix/plugins/FloatMathPlugin/acinclude.m4.orig
platforms/unix/plugins/FloatMathPlugin/acinclude.m4
+@@ -6,7 +6,7 @@ if test "$GCC" = yes; then
+ libm_cflags="-O -fomit-frame-pointer"
+ ;;
+ powerpc|ppc)
+-libm_cflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
++libm_cflags="-O3 -funroll-loops -mcpu=750"
+ ;;
+ esac
+ fi
Index: patches/patch-platforms_unix_vm_sqUnixMain_c
===
RCS file:
/cvs/ports/lang/squeak/vm/patches/patch-platforms_unix_vm_sqUnixMain_c,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-platforms_unix_vm_sqUnixMain_c
--- patches/patch-platforms_unix_vm_sqUnixMain_c14 Jan 2020 22:20:29
- 1.7
+++ patches/patch-platforms_unix_vm_sqUnixMain_c29 Nov 2020 10:18:46
-
@@ -25,6 +25,17 @@ Index: platforms/unix/vm/sqUnixMain.c
{ , "sound", "custom" }, /*** NO DEFAULT ***/
/* defaults */
{ , "display", "Quartz" },
+@@ -1292,8 +1289,8 @@ void imgInit(void)
+ || defined(POWERPC) || defined(__POWERPC) || defined
(__POWERPC__) )
+ void mtfsfi(unsigned long long fpscr)
+ {
+-__asm__("lfd f0, %0" :: "m"(fpscr));
+-__asm__("mtfsf 0xff, f0");
++__asm__("lfd 0, %0" :: "m"(fpscr));
++__asm__("mtfsf 0xff, 0");
+ }
+ #else
+ # define mtfsfi(fpscr)
@@ -1329,17 +1326,6 @@ int main(int argc, char **argv, char **envp)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 04:07:17 Removed files: sysutils/consul/patches: patch-vendor_github_com_shirou_gopsutil_process_process_openbsd_go Log message: Forgot in previous.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 04:06:56 Modified files: sysutils/exoscale-cli: Makefile distinfo Log message: Update to exoscale-cli-1.21.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:56:31 Modified files: sysutils/consul: Makefile distinfo Added files: sysutils/consul/patches: patch-vendor_github_com_shirou_gopsutil_v3_process_process_openbsd_go Log message: Update to consul-1.9.0.
Re: [UPDATE] graphics/blender -> 2.90.1
On 2020/11/29 05:13, Dimitri Karamazov wrote:
> On Sat, November 28, 2020 22:25, Pascal Stumpf wrote:
> > On Sat, 28 Nov 2020 20:55:29 +, Stuart Henderson wrote:
> >
> >> On 2020/11/28 20:15, Dimitri Karamazov wrote:
> >>
> >>> On Sat, November 28, 2020 14:53, Pascal Stumpf wrote:
> >>>
> >>>
> >>> -MAINTAINER = Pascal Stumpf
> >>> +MAINTAINER = Dimitri Karamazov
> >>>
> >>
> >> was this discussed? (please discuss maintainer changes explicitly rather
> >> than just adding them into a diff).
> >
> > Yes, fine with me.
> >
> >
> I, Dimitri Karamazov, take up the mantle of the MAINTAINER with blessings
> from Mr. Pascal Stumpf.
ok!
> >>> - ${MODPY_LIB_DEPENDS}
> >>>
> >>
> >> this should stay
> >>
> >
> I wonder why, this is appended to both BUILD_DEPENDS and RUN_DEPENDS,
> just like the rest of the python ports.
>
> Is this the new format for all python ports or what?
There is a WANTLIB entry coming from python, so there must be a
corresponding LIB_DEPENDS. Nothing new, but it's only needed for
ports that link to the python library.
> Hopefully this inline diff will work, made some changes to the client.
It didn't, the trailing space on lines in patches was removed ("-- "
to "--"). The client probably does something to avoid lines in the main
body text looking like signatures.
The attached one was ok though, I'll leave it building on my workstation.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/11/29 03:48:27 Modified files: sysutils/consolekit: Makefile sysutils/consolekit/patches: patch-src_ck-inhibit_c Added files: sysutils/consolekit/patches: patch-src_ck-inhibit-manager_c patch-src_ck-inhibit-manager_h patch-src_ck-inhibit_h Log message: unbreak the inhibitor list by using a lock based on the named pipe's filename which is random and unique for each inhibitor so that if one process takes multiple locks the proper one will be removed from the inhibitor list when the lock is removed by the process ok ajacoutot@
[macppc] lang/squeak/vm fix
Hi All,
With this patch squeak-vm builds and runs on my macppc machine. I've
had to make 3 changes. I've removed the -mno-fused-madd which doesn't
seem to exist on clang. I've changed f0 to just 0 in the powerpc
specific inline asm, not sure about this, but I thought the type of
register was implicit anyway. Finally, and this change affects all
platforms, I had to change the order of linker arguments; without this
I got a bunch of linker errors relating to the plugins. If there's
anything else I need to do, let me know.
I've only really tested it by clicking around in the default image,
which seems to function well, though I plan on having a play with
Squeak some more later.
Index: patches/patch-platforms_unix_config_Makefile_in
===
RCS file: patches/patch-platforms_unix_config_Makefile_in
diff -N patches/patch-platforms_unix_config_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-platforms_unix_config_Makefile_in 29 Nov 2020
10:18:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: platforms/unix/config/Makefile.in
+--- platforms/unix/config/Makefile.in.orig
platforms/unix/config/Makefile.in
+@@ -43,7 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak)
+ # VM
+
+ $(squeak) : config.sh $(SQLIBS) version.o
+- $(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
++ $(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
+ @echo
+ @size $(squeak)
+ @echo
Index: patches/patch-platforms_unix_config_acinclude_m4
===
RCS file:
/cvs/ports/lang/squeak/vm/patches/patch-platforms_unix_config_acinclude_m4,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-platforms_unix_config_acinclude_m4
--- patches/patch-platforms_unix_config_acinclude_m414 Jan 2020
22:20:29 - 1.1
+++ patches/patch-platforms_unix_config_acinclude_m429 Nov 2020
10:18:46 -
@@ -5,10 +5,20 @@ fix build on alpha
Index: platforms/unix/config/acinclude.m4
--- platforms/unix/config/acinclude.m4.orig
+++ platforms/unix/config/acinclude.m4
-@@ -255,16 +255,6 @@ fi)
+@@ -115,7 +115,7 @@ if test "$GCC" = yes; then
+ ac_optflags="-fomit-frame-pointer"
+ ;;
+ powerpc|ppc)
+-ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
++ac_optflags="-O3 -funroll-loops -mcpu=750"
+ ;;
+ esac
+ AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__"
Compiler: "__VERSION__])
+@@ -254,16 +254,6 @@ else ac_cv_module_prefix="lib"
+ fi)
AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix")
test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib])
-
+-
-AC_DEFUN([AC_64BIT_ARCH],
-[AC_MSG_CHECKING(for compiler flags to force 32-bit addresses)
-case $host in
@@ -18,7 +28,6 @@ Index: platforms/unix/config/acinclude.m
-;;
-esac
-AC_MSG_RESULT($CFLAGS_32)])
--
- ### plugin support
+ ### plugin support
Index:
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
===
RCS file:
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
diff -N
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-platforms_unix_plugins_FloatMathPlugin_acinclude_m4 29
Nov 2020 10:18:46 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: platforms/unix/plugins/FloatMathPlugin/acinclude.m4
+--- platforms/unix/plugins/FloatMathPlugin/acinclude.m4.orig
platforms/unix/plugins/FloatMathPlugin/acinclude.m4
+@@ -6,7 +6,7 @@ if test "$GCC" = yes; then
+ libm_cflags="-O -fomit-frame-pointer"
+ ;;
+ powerpc|ppc)
+-libm_cflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
++libm_cflags="-O3 -funroll-loops -mcpu=750"
+ ;;
+ esac
+ fi
Index: patches/patch-platforms_unix_vm_sqUnixMain_c
===
RCS file:
/cvs/ports/lang/squeak/vm/patches/patch-platforms_unix_vm_sqUnixMain_c,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-platforms_unix_vm_sqUnixMain_c
--- patches/patch-platforms_unix_vm_sqUnixMain_c14 Jan 2020 22:20:29
- 1.7
+++ patches/patch-platforms_unix_vm_sqUnixMain_c29 Nov 2020 10:18:46
-
@@ -25,6 +25,17 @@ Index: platforms/unix/vm/sqUnixMain.c
{ , "sound", "custom" },/*** NO DEFAULT ***/
/* defaults */
{ , "display", "Quartz" },
+@@ -1292,8 +1289,8 @@ void imgInit(void)
+ || defined(POWERPC) || defined(__POWERPC) || defined
(__POWERPC__) )
+ void mtfsfi(unsigned long long fpscr)
+ {
+-__asm__("lfd f0, %0" :: "m"(fpscr));
+-__asm__("mtfsf 0xff, f0");
++__asm__("lfd 0, %0" :: "m"(fpscr));
++__asm__("mtfsf 0xff, 0");
+ }
+ #else
+ # define mtfsfi(fpscr)
@@ -1329,17 +1326,6 @@ int main(int argc, char **argv, char **envp)
outOfMemory();
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:34:15 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.26.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:31:55 Modified files: sysutils/nomad : Makefile distinfo Log message: Update to nomad-0.12.9.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:29:27 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.18.185.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:29:14 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.16.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:29:02 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.19.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:19:52 Modified files: sysutils/amazon-ssm-agent: Makefile distinfo Log message: Update to amazon-ssm-agent-3.0.431.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 03:07:32 Modified files: sysutils/toad : Makefile distinfo Log message: Update to toad-1.11.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/29 02:34:14 Modified files: www/p5-WWW-Search-Ebay: Makefile distinfo www/p5-WWW-Search-Ebay/pkg: PLIST Log message: Update to p5-WWW-Search-Ebay-3.056.
Re: [Update] devel/liblouis : Update to 3.15.0
On Sun, Nov 29, 2020 at 06:33:54AM +, wen heping wrote:
> Hi, ports@:
>
> Here is a patch to update devel/liblouis to 3.15.0, it
> build well and pass the test on amd64-current system.
>One port depends on it: x11/gnome/orca, it build well
> and pass all tests too.
Committed, thanks :-)
>
>
> Cheers !
> wen
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/liblouis/Makefile,v
> retrieving revision 1.33
> diff -u -p -r1.33 Makefile
> --- Makefile 19 Aug 2020 12:08:58 - 1.33
> +++ Makefile 29 Nov 2020 06:29:19 -
> @@ -2,10 +2,10 @@
>
> COMMENT= braille translator, back-translator and formatter
>
> -V= 3.14.0
> +V= 3.15.0
> DISTNAME=liblouis-${V}
>
> -SHARED_LIBS += louis8.0 # 20.2
> +SHARED_LIBS += louis8.0 # 20.3
>
> CATEGORIES= devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/liblouis/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 19 Aug 2020 12:08:58 - 1.17
> +++ distinfo 29 Nov 2020 06:29:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (liblouis-3.14.0.tar.gz) =
> 9bJfgFnddlla60GbFSLdp48oGnWnxW3OqqRD+MQ3MGo=
> -SIZE (liblouis-3.14.0.tar.gz) = 14747653
> +SHA256 (liblouis-3.15.0.tar.gz) =
> OjgbEysUB0fl/NRzVNps9DlZ2iFn+LxZhDC7rFEiRGc=
> +SIZE (liblouis-3.15.0.tar.gz) = 14831143
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/liblouis/pkg/PLIST,v
> retrieving revision 1.18
> diff -u -p -r1.18 PLIST
> --- pkg/PLIST 19 Aug 2020 12:08:58 - 1.18
> +++ pkg/PLIST 29 Nov 2020 06:29:19 -
> @@ -80,6 +80,7 @@ share/liblouis/tables/ckb-translation.ct
> share/liblouis/tables/ckb.tbl
> share/liblouis/tables/compress.cti
> share/liblouis/tables/controlchars.cti
> +share/liblouis/tables/cop-eg-comp8.utb
> share/liblouis/tables/corrections.cti
> share/liblouis/tables/countries.cti
> share/liblouis/tables/cs-chardefs.cti
--
Antoine
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/11/29 02:13:46 Modified files: devel/liblouis : Makefile distinfo devel/liblouis/pkg: PLIST Log message: Update to liblouis-3.15.0. from wen heping
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/29 02:13:36 Modified files: security/p5-Crypt-Twofish: Makefile distinfo security/p5-Crypt-Twofish/pkg: PLIST Log message: Update to p5-Crypt-Twofish-2.18.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/29 01:19:39 Modified files: www/p5-HTTP-Entity-Parser: Makefile distinfo Log message: Update to p5-HTTP-Entity-Parser-0.25 from wen heping
