CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/08 00:58:06 Modified files: devel/py-buildbot: Makefile.inc devel/py-buildbot/buildbot: distinfo devel/py-buildbot/console-view: distinfo devel/py-buildbot/grid-view: distinfo devel/py-buildbot/pkg: distinfo devel/py-buildbot/waterfall-view: distinfo devel/py-buildbot/www: distinfo Log message: devel/py-buildbot: update to 2.10.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/08 00:57:51 Modified files: devel/py-buildslave: Makefile distinfo Log message: devel/py-buildslave: update to 2.10.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/08 00:22:35 Modified files: geo/merkaartor : Makefile Log message: geo/merkaartor: add link to upstream issue about proj8
[sparc64] Fix build of lang/php{7.4|8.0}
php 7.4 and 8.0 have been failing during configure because the libgd tests
fail. They fail because the linker cannot find freetype and other similar
libraries that are in /usr/X11R6/lib.
This patch adds "-L${X11BASE}/lib" to the LDFLAGS of CONFIGURE_ENV
It fixes the build on sparc64.
ok?
cc maintainer
--Kurt
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.157
diff -u -p -r1.157 Makefile.inc
--- Makefile.inc24 Feb 2021 19:14:11 - 1.157
+++ Makefile.inc7 Mar 2021 22:35:08 -
@@ -48,7 +48,7 @@ CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION?= 2.69
COMPILER= base-clang ports-gcc base-gcc
CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include
-pthread" \
- LDFLAGS="-L${LOCALBASE}/lib -pthread" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -pthread" \
EXTENSION_DIR=${MODULES_DIR} \
COMPILER_LIBCXX="${LIBCXX}" \
lt_cv_path_SED=/usr/bin/sed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2021/03/07 22:48:41 Modified files: audio/ncspot : Makefile distinfo audio/ncspot/patches: patch-Cargo_toml Log message: Update to ncspot-0.5.0 Changelog: https://github.com/hrkfdn/ncspot/releases/tag/v0.5.0 >From maintainer (Henrik Friedrichsen ). Thank you!
Re: fix print/scribus for poppler-21.03.0
Matthias Kilian writes:
> Hi,
>
> this fixes the build of scribus with poppler-21.03.0. Based on
> upstream svn.
OK gnezdo
>
> Ciao,
> Kili
>
> Index: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
> ===
> RCS file:
> /cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_cpp,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-scribus_plugins_import_pdf_slaoutput_cpp
> --- patches/patch-scribus_plugins_import_pdf_slaoutput_cpp21 Mar 2020
> 19:48:55 - 1.2
> +++ patches/patch-scribus_plugins_import_pdf_slaoutput_cpp7 Mar 2021
> 17:54:47 -
> @@ -5,6 +5,8 @@ Fix build with newer poppler, from archl
>
> Fix for poppler-0.86.x from svn r23478.
>
> +Fix for poppler-21.03.x from svn r24537 and r24538.
> +
> Index: scribus/plugins/import/pdf/slaoutput.cpp
> --- scribus/plugins/import/pdf/slaoutput.cpp.orig
> +++ scribus/plugins/import/pdf/slaoutput.cpp
> @@ -321,7 +323,29 @@ Index: scribus/plugins/import/pdf/slaout
> }
>
> void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
> -@@ -3705,7 +3805,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo
> +@@ -2208,8 +2308,11 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
> + return gTrue;
> + }
> +
> +-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/,
> Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int
> tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
> double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
> ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/,
> Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int
> x1, int y1, double xStep, double yStep)
> + {
> ++const double *bbox = tPat->getBBox();
> ++const double *pmat = tPat->getMatrix();
> ++Dict *resDict = tPat->getResDict();
> + PDFRectangle box;
> + Gfx *gfx;
> + QString id;
> +@@ -2238,7 +2341,7 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state,
> +
> + gfx = new Gfx(pdfDoc, this, resDict, , nullptr);
> + inPattern++;
> +-gfx->display(str);
> ++gfx->display(tPat->getContentStream());
> + inPattern--;
> + gElements = m_groupStack.pop();
> + m_doc->m_Selection->clear();
> +@@ -3705,7 +3808,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo
> return fNam;
> }
>
> @@ -330,7 +354,7 @@ Index: scribus/plugins/import/pdf/slaout
> {
> if (! path)
> return QString();
> -@@ -3715,7 +3815,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
> +@@ -3715,7 +3818,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
>
> for (int i = 0; i < path->getNumSubpaths(); ++i)
> {
> @@ -339,7 +363,7 @@ Index: scribus/plugins/import/pdf/slaout
> if (subpath->getNumPoints() > 0)
> {
> output += QString("M %1
> %2").arg(subpath->getX(0)).arg(subpath->getY(0));
> -@@ -3917,6 +4017,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONS
> +@@ -3917,6 +4020,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONS
> u = s1->getChar(i) & 0xff;
> ++i;
> }
> Index: patches/patch-scribus_plugins_import_pdf_slaoutput_h
> ===
> RCS file:
> /cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_h,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-scribus_plugins_import_pdf_slaoutput_h
> --- patches/patch-scribus_plugins_import_pdf_slaoutput_h 21 Mar 2020
> 19:48:55 - 1.2
> +++ patches/patch-scribus_plugins_import_pdf_slaoutput_h 7 Mar 2021
> 17:54:47 -
> @@ -2,6 +2,8 @@ $OpenBSD: patch-scribus_plugins_import_p
>
> Fix for poppler-0.86.x from svn r23478.
>
> +Fix for poppler-21.03.x from svn r24537 and r24538.
> +
> Index: scribus/plugins/import/pdf/slaoutput.h
> --- scribus/plugins/import/pdf/slaoutput.h.orig
> +++ scribus/plugins/import/pdf/slaoutput.h
> @@ -27,6 +29,15 @@ Index: scribus/plugins/import/pdf/slaout
> static GBool annotations_callback(Annot *annota, void *user_data);
> bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double
> width, double height);
> bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double
> width, double height);
> +@@ -189,7 +195,7 @@ class SlaOutputDev : public OutputDev (public)
> + void stroke(GfxState *state) override;
> + void fill(GfxState *state) override;
> + void eoFill(GfxState *state) override;
> +-GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object
> *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict
> *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int
> x0, int y0, int x1, int y1, double xStep, double
Re: update print/poppler
Matthias Kilian writes:
> Hi,
>
> this updates poppler to 21.03.0. Tested on amd64. If noone complains or
> wants me to wait longer, I'll commit this (together with a fix for
> scribus) on wednesday.
This looks good to me.
I'm not sure how to decide which SHARED_LIBS should be bumped. Do we
have some tools for helping notice when a bump is needed or just follow
the upstream bumps? Somehow I managed to not have touched a single port
that needed an bump of this kind.
Thanks
Greg
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/poppler/Makefile,v
> retrieving revision 1.164
> diff -u -p -r1.164 Makefile
> --- Makefile 7 Dec 2020 21:31:24 - 1.164
> +++ Makefile 7 Mar 2021 17:54:35 -
> @@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
> COMMENT-qt5= Qt5 interface to PDF rendering library
> COMMENT-utils= PDF conversion tools and utilities
>
> -V= 20.12.0
> +V= 21.03.0
> DISTNAME=poppler-$V
> CATEGORIES= print
> PKGNAME-main=poppler-$V
> @@ -13,9 +13,9 @@ PKGNAME-qt5=poppler-qt5-$V
>
> EXTRACT_SUFX=.tar.xz
>
> -SHARED_LIBS += poppler 68.0 # 105.0
> +SHARED_LIBS += poppler 69.0 # 108.0
> SHARED_LIBS += poppler-glib 19.8 # 8.19
> -SHARED_LIBS += poppler-qt5 8.6 # 1.26
> +SHARED_LIBS += poppler-qt5 8.7 # 1.27
> SHARED_LIBS += poppler-cpp 16.2 # 0.9
>
> HOMEPAGE=https://poppler.freedesktop.org/
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/poppler/distinfo,v
> retrieving revision 1.88
> diff -u -p -r1.88 distinfo
> --- distinfo 7 Dec 2020 21:31:24 - 1.88
> +++ distinfo 7 Mar 2021 17:54:35 -
> @@ -1,2 +1,2 @@
> -SHA256 (poppler-20.12.0.tar.xz) =
> o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ=
> -SIZE (poppler-20.12.0.tar.xz) = 1659844
> +SHA256 (poppler-21.03.0.tar.xz) =
> /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
> +SIZE (poppler-21.03.0.tar.xz) = 1690848
> Index: patches/patch-poppler_Form_cc
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-poppler_Form_cc
> --- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 - 1.7
> +++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20
> Index: poppler/Form.cc
> --- poppler/Form.cc.orig
> +++ poppler/Form.cc
> -@@ -34,6 +34,7 @@
> +@@ -36,6 +36,7 @@
> #include
>
> #include
> Index: patches/patch-poppler_XRef_cc
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
> retrieving revision 1.24
> diff -u -p -r1.24 patch-poppler_XRef_cc
> --- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 - 1.24
> +++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2
> Index: poppler/XRef.cc
> --- poppler/XRef.cc.orig
> +++ poppler/XRef.cc
> -@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
> +@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
>
> bool XRef::okToPrint(bool ignoreOwnerPW) const
> {
> @@ -11,7 +11,7 @@ Index: poppler/XRef.cc
> }
>
> // we can print at high res if we are only doing security handler revision
> -@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
> +@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
> // 3 and we are allowed to print, and bit 12 is set.
> bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
> {
> Index: patches/patch-qt5_src_CMakeLists_txt
> ===
> RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt
> --- patches/patch-qt5_src_CMakeLists_txt 7 Dec 2020 21:31:24 -
> 1.3
> +++ patches/patch-qt5_src_CMakeLists_txt 7 Mar 2021 17:54:35 -
> @@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
> Index: qt5/src/CMakeLists.txt
> --- qt5/src/CMakeLists.txt.orig
> +++ qt5/src/CMakeLists.txt
> -@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
> +@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
> poppler-version.cpp
> )
> add_library(poppler-qt5 ${poppler_qt5_SRCS})
> --set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
> +-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
> if(MINGW AND BUILD_SHARED_LIBS)
> get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
> set_target_properties(poppler-qt5 PROPERTIES SUFFIX
>
[new] graphics/pngquant (efficient png compressor)
Hello, this is a port for pngquant https://github.com/kornelski/pngquant/ a PNG compressor which is really efficient (it's lossy but I really can't tell a difference). I manually install the COPYRIGHT file because it's asked on the project page. I am not sure BUILD_DEPENDS is required but the configure file uses /usr/bin/env bash > Under GPL v3 or later with an additional copyright notice that must be kept > for the older parts of the code. I did a benchmark with 3 originals files, pngquant compression and optipng. The % row is pngquant result compared to original file size. web browser screenshot game screenshot Scalc diagram original size 135810 396574 15936 optinpng87372 340868 14592 pngquant44797 267654 6797 % of orig size 33% 68% 43% pngquant.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2021/03/07 19:02:31 Modified files: sysutils/bfs : Makefile distinfo sysutils/bfs/patches: patch-Makefile patch-tests_sh sysutils/bfs/pkg: PLIST Log message: Update to bfs-2.2 Changelog for the last two updates: https://github.com/tavianator/bfs/releases
Re: NEW: devel/git-annex
On Sat, Mar 06, 2021 at 12:25:59PM -0800, Greg Steuck wrote: > Greg Steuck writes: > >> I'm happy to prepare an 8.10-compatible version now if that would help > >> with the upgrade to 8.10. > > > > Thanks, that wouldn't hurt :) > > I gave it a whirl, what do you think: Thanks. I just built the below version (with your ghc 8.10 update patches, and also your patches from another email to remove ghc.port.mk etc) and tried it out, and confirm that it works. -- James
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/03/07 18:03:32 Modified files: devel/quirks : Makefile Log message: Unbreak/bump after ghc.pm removal
Remove devel/p5-VCP-autrijus?
It appears that p5-VCP-autrijus no longer works. At least, many tests fail, some files seem to no longer compile with recent perl versions and there are no consumers. Does anyone want this or can we remove it?
Ping Again - Re: [New] devel/re2
Ping again, hoping someone can import this one. Thanks. re2-2021.02.02.tgz Description: Binary data Stuart Henderson writes: > this is OK with me to import. > > > On 2021/02/28 15:52, Ashton Fagg wrote: >> Ping. >> > > >> >> >> Ashton Fagg writes: >> >> > It appears I forgot about this, :-). >> > >> > Latest tarball attached - updated to latest version. >> > >> > Thanks. >> > >> > >> > >> > Ashton Fagg writes: >> > >> >> Ping on this one. Tarball attached. >> >> >> >> Ashton Fagg writes: >> >> >> >>> Stuart Henderson writes: >> >>> >> You mentioned a cmakefile change that would increase it, can you show >> that please, some of us only have slow machines like >> >> cpu3: Intel(R) Xeon(R) CPU E3-1225 v3 @ 3.20GHz, 3392.17 MHz, 06-3c-03 >> >> :) >> >>> >> >>> Here you go. I've added a patch that increases the timeout, with >> >>> reference in the Makefile. I've increased it from 1500 seconds to >> >>> 2000. This seems to help on my slower machine.
net/mrtg Adjust RUN_DEPENDS and PLIST to not install Pod modules that are elsewhere
While looking at ports that might need to include p5-Pod-Parser that got
removed from core in perl 5.32, I came across mrtg where it has been
installing really old versions of core modules.
(I only tried that it built, not that it actually worked as I don't
actually run mrtg anywhere)
Comments, OK (with REVISION bump)?
$ grep \\.pm /usr/ports/textproc/p5-Pod-Parser/pkg/PLIST
${P5SITE}/Pod/Find.pm
${P5SITE}/Pod/InputObjects.pm
${P5SITE}/Pod/ParseUtils.pm
${P5SITE}/Pod/Parser.pm
${P5SITE}/Pod/PlainText.pm
${P5SITE}/Pod/Select.pm
$ ls /usr/libdata/perl5/Pod/Usage.pm
/usr/libdata/perl5/Pod/Usage.pm
Index: Makefile
===
RCS file: /cvs/ports/net/mrtg/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile12 Jul 2019 20:48:32 - 1.93
+++ Makefile8 Mar 2021 00:27:14 -
@@ -21,7 +21,8 @@ BUILD_DEPENDS=textproc/groff
RUN_DEPENDS= net/p5-IO-Socket-INET6 \
net/p5-Net-SNMP \
net/p5-SNMP_Session \
- net/rrdtool
+ net/rrdtool \
+ textproc/p5-Pod-Parser
LIB_DEPENDS= graphics/gd
CONFIGURE_STYLE= autoconf
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/mrtg/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- pkg/PLIST 13 Jul 2018 07:56:05 - 1.29
+++ pkg/PLIST 8 Mar 2021 00:27:14 -
@@ -9,12 +9,12 @@ bin/mrtg-traffic-sum
@bin bin/rateup
libdata/perl5/site_perl/MRTG_lib.pm
libdata/perl5/site_perl/Net_SNMP_util.pm
-libdata/perl5/site_perl/Pod/
-libdata/perl5/site_perl/Pod/InputObjects.pm
-libdata/perl5/site_perl/Pod/Parser.pm
-libdata/perl5/site_perl/Pod/PlainText.pm
-libdata/perl5/site_perl/Pod/Select.pm
-libdata/perl5/site_perl/Pod/Usage.pm
+@comment core perl or p5-Pod-Parser
+@comment libdata/perl5/site_perl/Pod/InputObjects.pm
+@comment libdata/perl5/site_perl/Pod/Parser.pm
+@comment libdata/perl5/site_perl/Pod/PlainText.pm
+@comment libdata/perl5/site_perl/Pod/Select.pm
+@comment libdata/perl5/site_perl/Pod/Usage.pm
libdata/perl5/site_perl/locales_mrtg.pm
@man man/man1/cfgmaker.1
@man man/man1/indexmaker.1
Re: [new] graphics/pngquant (efficient png compressor)
On Mon, Mar 08, 2021 at 12:39:11AM +0100, Solene Rapenne wrote: > Hello, > this is a port for pngquant https://github.com/kornelski/pngquant/ > a PNG compressor which is really efficient (it's lossy but I > really can't tell a difference). > I manually install the COPYRIGHT file because it's asked on the > project page. > I am not sure BUILD_DEPENDS is required but the configure file > uses /usr/bin/env bash > > Under GPL v3 or later with an additional copyright notice that must be kept > > for the older parts of the code. > I did a benchmark with 3 originals files, pngquant compression and > optipng. The % row is pngquant result compared to original file size. > web browser screenshot game screenshot Scalc diagram > original size 135810 396574 15936 > optinpng 87372 340868 14592 > pngquant 44797 267654 6797 > % of orig size33% 68% 43% Looks good and builds fine on sparc64 ok kmos --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 16:24:36 Modified files: devel/p5-Test-Spelling: Makefile Log message: RUN_DEPENDS+=textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2021/03/07 16:17:57
Modified files:
www/p5-PodToHTML: Makefile
Log message:
RUN_DEPENDS+=textproc/p5-Pod-Parser
While here remove unnecessary BUILD_DEPENDS=${RUN_DEPENDS}
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 16:13:37 Modified files: textproc/p5-Pod-Spell: Makefile Log message: RUN_DEPENDS+=textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 16:05:59 Modified files: sysutils/p5-File-Rename: Makefile Log message: TEST_DEPENDS+=devel/p5-IO-stringy textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 15:56:46 Modified files: devel/p5-Pod-Coverage: Makefile Log message: RUN_DEPENDS+=textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 15:48:00 Modified files: textproc/p5-Pod-LaTeX: Makefile Log message: Add RUN_DEPENDS=textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2021/03/07 15:45:21 Modified files: devel/p5-Pod-Constant: Makefile Log message: Add RUN_DEPENDS=textproc/p5-Pod-Parser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2021/03/07 15:26:27 Modified files: x11/pmenu : Makefile x11/pmenu/pkg : DESCR Log message: Honour CFLAGS and in turn make the debug package actually useful as the current one contains no symbols; this is due to CFLAGS containing DEBUG which passes "-g" as per DEBUG_PACKAGES. Upstream should tweak their config.mk to support proper variable usage without downstream having to patch makefiles. Fix DESCR while here. OK sthen
Re: x11/pmenu:
On Sun, Mar 07, 2021 at 09:08:20PM +, Stuart Henderson wrote:
> On 2021/03/07 21:40, Klemens Nanni wrote:
> > On Sun, Mar 07, 2021 at 08:08:59PM +, Stuart Henderson wrote:
> > > > > +++ pkg/DESCR 7 Mar 2021 18:36:33 -
> > > > > @@ -1,6 +1,7 @@
> > > > > -piemenu is a pie menu utility for X. It receives a menu
> > > > > specification OD
> > > > > +piemenu is a pie menu utility for X. It receives a menu specification
> > > > > in stdin, shows a menu for the user to select one of the options,
> > >
> > > "from stdin" or "from standard input" would read a little better
> > Agreed, but DESCR is taken from the project's readme as is, so I've left
> > our copy as-is.
> >
>
> Hmm. That doesn't make a lot of sense to me...
Sorry for the noise; OK for that?
Index: Makefile
===
RCS file: /cvs/ports/x11/pmenu/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Mar 2021 22:46:21 - 1.1.1.1
+++ Makefile7 Mar 2021 21:05:58 -
@@ -5,6 +5,7 @@ COMMENT = contextual radial menu for X11
GH_ACCOUNT = phillbush
GH_PROJECT = pmenu
GH_TAGNAME = v2.2.0
+REVISION = 0
CATEGORIES = x11
@@ -25,6 +26,12 @@ NO_TEST =Yes
MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
MANPREFIX=${PREFIX}/man
+
+# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
+# (`+=') not set (`=') variables.
+# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and pass
+# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to work.
+MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
Index: pkg/DESCR
===
RCS file: /cvs/ports/x11/pmenu/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 4 Mar 2021 22:46:21 - 1.1.1.1
+++ pkg/DESCR 7 Mar 2021 21:16:46 -
@@ -1,6 +1,7 @@
-piemenu is a pie menu utility for X. It receives a menu specification OD
-in stdin, shows a menu for the user to select one of the options,
+piemenu is a pie menu utility for X. It receives a menu specification
+from stdin, shows a menu for the user to select one of the options
and outputs the option selected to stdout.
+
Features include radial Submenus (some pie-menu slices can spawn another
-menu), Icons (pie-menu slices can contain icon image),X resources support
-and Root window mode
+menu), Icons (pie-menu slices can contain icon image), X resources support
+and Root window mode.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2021/03/07 14:09:06 Modified files: textproc/doclifter: Makefile distinfo textproc/doclifter/patches: patch-manlifter Log message: update doclifter to 2.19 and switch to python3
Re: x11/pmenu:
On 2021/03/07 21:40, Klemens Nanni wrote: > On Sun, Mar 07, 2021 at 08:08:59PM +, Stuart Henderson wrote: > > > > +++ pkg/DESCR 7 Mar 2021 18:36:33 - > > > > @@ -1,6 +1,7 @@ > > > > -piemenu is a pie menu utility for X. It receives a menu specification > > > > OD > > > > +piemenu is a pie menu utility for X. It receives a menu specification > > > > in stdin, shows a menu for the user to select one of the options, > > > > "from stdin" or "from standard input" would read a little better > Agreed, but DESCR is taken from the project's readme as is, so I've left > our copy as-is. > Hmm. That doesn't make a lot of sense to me...
Re: childsplay needs py-numpy
On 2021/03/07 21:01, Stuart Henderson wrote: > On 2021/03/07 18:13, Remi Locherer wrote: > > On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote: > > > On 2021/03/07 13:12, Remi Locherer wrote: > > > > Without numpy childsplay fails to start (see cairoimage.py). > > > > > > > > OK? > > > > > > ok. I wonder if we should split off a py2-numpy.. > > > > Actually, there is a version 3.3 from 2018 that does not need numpy. > > It still depends on Python 2 though ... > > > > Changelog: > > https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog > > > > OK? > > Oh that's better. Seems to work fine here, OK > Timo Myyrä sent a similar diff back in 2018, but without -py-numpy..
Re: childsplay needs py-numpy
On 2021/03/07 18:13, Remi Locherer wrote: > On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote: > > On 2021/03/07 13:12, Remi Locherer wrote: > > > Without numpy childsplay fails to start (see cairoimage.py). > > > > > > OK? > > > > ok. I wonder if we should split off a py2-numpy.. > > Actually, there is a version 3.3 from 2018 that does not need numpy. > It still depends on Python 2 though ... > > Changelog: > https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog > > OK? Oh that's better. Seems to work fine here, OK
switch uncrustify to python3 and update
Here's an update of uncrustify to a newer release.
This port seems to work fine with python3 too.
Tested on amd64 where all regress tests pass.
ok?
Index: Makefile
===
RCS file: /cvs/ports/textproc/uncrustify/Makefile,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile
--- Makefile23 Feb 2021 19:39:46 - 1.26
+++ Makefile7 Mar 2021 20:33:15 -
@@ -2,7 +2,7 @@
COMMENT = source code beautifier
-DISTNAME = uncrustify-0.71.0
+DISTNAME = uncrustify-0.72.0
CATEGORIES = textproc devel
@@ -21,7 +21,6 @@ COMPILER =base-clang ports-gcc
MODULES = devel/cmake \
lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
MODPY_RUNDEP = No
Index: distinfo
===
RCS file: /cvs/ports/textproc/uncrustify/distinfo,v
retrieving revision 1.14
diff -u -p -u -r1.14 distinfo
--- distinfo21 Jun 2020 07:17:08 - 1.14
+++ distinfo7 Mar 2021 20:33:15 -
@@ -1,2 +1,2 @@
-SHA256 (uncrustify-0.71.0.tar.gz) =
G3Zd/TbJhbtB6NLajSJq6Ldpvnn7Lh4sYKeLm64jqMM=
-SIZE (uncrustify-0.71.0.tar.gz) = 1703222
+SHA256 (uncrustify-0.72.0.tar.gz) =
7vifR4WGANE9MYwNPW2FUHXtuk5PG6pvBzPub5UNY9M=
+SIZE (uncrustify-0.72.0.tar.gz) = 1529996
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/uncrustify/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -r1.5 PLIST
--- pkg/PLIST 21 Jun 2020 07:17:08 - 1.5
+++ pkg/PLIST 7 Mar 2021 20:33:15 -
@@ -2,6 +2,12 @@
@bin bin/uncrustify
@man man/man1/uncrustify.1
share/doc/uncrustify/
+share/doc/uncrustify/AUTHORS
+share/doc/uncrustify/BUGS
+share/doc/uncrustify/COPYING
+share/doc/uncrustify/ChangeLog
+share/doc/uncrustify/HELP
+share/doc/uncrustify/README.md
share/doc/uncrustify/examples/
share/doc/uncrustify/examples/MS-calling_conventions.cfg
share/doc/uncrustify/examples/amxmodx.cfg
Re: x11/pmenu:
On Sun, Mar 07, 2021 at 08:08:59PM +, Stuart Henderson wrote: > > > +++ pkg/DESCR 7 Mar 2021 18:36:33 - > > > @@ -1,6 +1,7 @@ > > > -piemenu is a pie menu utility for X. It receives a menu specification OD > > > +piemenu is a pie menu utility for X. It receives a menu specification > > > in stdin, shows a menu for the user to select one of the options, > > "from stdin" or "from standard input" would read a little better Agreed, but DESCR is taken from the project's readme as is, so I've left our copy as-is.
Re: NEW PORT (dependency update): libebur128 1.2.6
On Sun, Mar 07, 2021 at 02:11:10PM +0100, Marc Espie wrote:
> Stumbled upon this while updating mlt.
>
> It's a library that "implements the ebur R 128 loudness standard"
> (whatever that means)
>
> Turns out both multimedia/mlt and audio/cantata bundle that code.
>
> It's a very small library, just one file, but we should move to
> the upstream version.
>
> Two reasons:
> - bundled version uses queue.h, but depends on its bundled version
> instead of detecting and using the system one.
>
> - bundled version uses outdated code. In particular, newer code
> has a safe_multiply function that borrows directly from our memory
> allocator, and hence avoids integer overflows.
>
> A full grep of the package logs show no other possible users.
> ffmpeg, as usual, plays the lone kid and has its own distinct
> implementation of the ebur128 standard.
>
> Here are patches to both mlt and cantata to use this, along with
> the port itself as an attached tarball
>
> (note: I will also need to check WANTLIB on consumers of cantata
> and mlt, but that shouldn't be too hard)
>
> Index: audio/Makefile
> ===
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.450
> diff -u -p -r1.450 Makefile
> --- audio/Makefile20 Feb 2021 20:54:56 - 1.450
> +++ audio/Makefile7 Mar 2021 13:10:06 -
> @@ -74,6 +74,7 @@
> SUBDIR += libcue
> SUBDIR += libdca
> SUBDIR += libdiscid
> + SUBDIR += libebur128
> SUBDIR += libgpod
> SUBDIR += libid3tag
> SUBDIR += liblastfm
> Index: audio/cantata/Makefile
> ===
> RCS file: /cvs/ports/audio/cantata/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- audio/cantata/Makefile3 Oct 2020 07:21:50 - 1.23
> +++ audio/cantata/Makefile7 Mar 2021 13:10:06 -
> @@ -5,6 +5,7 @@ COMMENT = Qt-based MPD client
> V = 2.4.2
> DISTNAME = cantata-${V}
> HOMEPAGE = https://github.com/CDrummond/cantata
> +REVISION = 0
>
> MASTER_SITES =
> https://github.com/CDrummond/cantata/releases/download/v${V}/
> EXTRACT_SUFX = .tar.bz2
> @@ -27,6 +28,7 @@ RUN_DEPENDS += x11/gtk+3,-guic
> LIB_DEPENDS += audio/mpg123 \
> audio/libcdio \
> audio/libcdio-paranoia \
> + audio/libebur128 \
> audio/libcddb \
> audio/libmusicbrainz5 \
> audio/taglib \
> Index: multimedia/mlt/Makefile
> ===
> RCS file: /cvs/ports/multimedia/mlt/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- multimedia/mlt/Makefile 24 Aug 2020 14:09:54 - 1.27
> +++ multimedia/mlt/Makefile 7 Mar 2021 13:10:06 -
> @@ -6,6 +6,7 @@ VERSION = 6.22.1
> DISTNAME = mlt-${VERSION}
> PKGNAME-main = ${DISTNAME}
> PKGNAME-gpl2 = mlt-gpl2-${VERSION}
> +REVISION = 0
>
> # XXX versions should be kept in sync together
> SHARED_LIBS =mlt 3.2
> @@ -24,6 +25,7 @@ WANTLIB-main += ${COMPILER_LIBCXX} SDL S
> WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig gdk-x11-2.0
> WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
> WANTLIB-main += pangoft2-1.0 sox swresample swscale vorbisfile xml2
> +WANTLIB-main += ebur128
>
> WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
> WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
> @@ -43,6 +45,7 @@ RUN_DEPENDS-main = audio/ladspa \
> x11/gtk+3,-guic
>
> LIB_DEPENDS-main = audio/jack \
> + audio/libebur128 \
> audio/sox \
> devel/sdl-image \
> devel/sdl2 \
In case you guys wonder what EBU R128 is, I found a reasonable write-up
here:
https://auphonic.com/blog/2012/08/02/loudness-measurement-and-normalization-ebu-r128-calm-act/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 13:22:59 Modified files: textproc/py-sphinx_rtd_theme: Makefile Log message: use different suffix when applying debian patchset
Re: x11/pmenu:
On 2021/03/07 20:30, Jerome KASPER wrote: > Hi klemmens, > > First of all thanks for testing and reviewing. > Nice spots in the grammar description. > I will poke upstream about adding CFLAGS += > in the config.mk and will report back. > I didn't knew about CPPFLAGS overriding with > CFLAGS, is it a clang trick for debug? CPPFLAGS is normally "c preprocessor flags" and would normally be used when invoking the compiler to compile source code files, but not used when invoking the compiler to link objects. > > +++ pkg/DESCR 7 Mar 2021 18:36:33 - > > @@ -1,6 +1,7 @@ > > -piemenu is a pie menu utility for X. It receives a menu specification OD > > +piemenu is a pie menu utility for X. It receives a menu specification > > in stdin, shows a menu for the user to select one of the options, "from stdin" or "from standard input" would read a little better > > and outputs the option selected to stdout. > > + > > Features include radial Submenus (some pie-menu slices can spawn another > > -menu), Icons (pie-menu slices can contain icon image),X resources support > > -and Root window mode > > +menu), Icons (pie-menu slices can contain icon image), X resources support > > +and Root window mode. > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/03/07 12:56:33 Modified files: x11/adwaita-qt : Makefile Added files: x11/adwaita-qt/patches: patch-src_lib_adwaita-qt_pc_cmake Log message: Fix pkg-config adwaita-qt.pc by remove duplicate "Requires" Spotted by zhuk@ thanks
Re: ghc 8.10.3 updates
Great, thanks for the reviews and testing on i386. The extra few days give the previous batch more chances to settle :) On Sun, Mar 7, 2021 at 9:41 AM Matthias Kilian wrote: > Hi Greg, > > On Sat, Mar 06, 2021 at 12:32:10PM -0800, Greg Steuck wrote: > > Once the other 3 cleanup patches are applied we can proceed with this > > update which will take us to ghc-8.10.3. I'm double-checking that all > > Haskell ports still work on amd64, but it seems like a fairly limited > > affar. We should be able to finish in the next week if all goes well. > > Thanks. I'll give it a try on i386 and hope to get results on tuesday or > wednesday. > > Ciao, > Kili > -- nest.cx is Gmail hosted, use PGP: https://pgp.key-server.io/0x0B1542BD8DF5A1B0 Fingerprint: 5E2B 2D0E 1E03 2046 BEC3 4D50 0B15 42BD 8DF5 A1B0
projectlibre update 1.9.1 -> 1.9.3
Hello! This is a trivial update for projectlibre. I could not find a real changelist, just these blog articles: https://www.projectlibre.com/blog/projectlibre-new-release-192 https://www.projectlibre.com/blog/projectlibre-release-project-managers-set-language-currency-date-format-wdropdown-list I haven't seen any differences between 1.9.1 and 1.9.3 after going through most of the dialogs. Marcus Index: Makefile === RCS file: /cvs/ports/productivity/projectlibre/Makefile,v retrieving revision 1.18 diff -u -p -u -r1.18 Makefile --- Makefile3 Nov 2019 14:07:45 - 1.18 +++ Makefile7 Mar 2021 16:42:55 - @@ -2,7 +2,7 @@ COMMENT= open source alternative to Microsoft Project -DISTNAME= projectlibre-1.9.1 +DISTNAME= projectlibre-1.9.3 REVISION= 1 CATEGORIES=productivity Index: distinfo === RCS file: /cvs/ports/productivity/projectlibre/distinfo,v retrieving revision 1.10 diff -u -p -u -r1.10 distinfo --- distinfo15 Apr 2019 17:02:12 - 1.10 +++ distinfo7 Mar 2021 16:42:55 - @@ -1,2 +1,2 @@ -SHA256 (projectlibre-1.9.1.tar.gz) = ZcqWco61oxw+I+tDGB3eNn14Woa4LzMMpSvHtRx0pbs= -SIZE (projectlibre-1.9.1.tar.gz) = 17991046 +SHA256 (projectlibre-1.9.3.tar.gz) = b5391c4b060b9722f85759128c85644b61ab0ed9fc004c87f5f311311c276bac +SIZE (projectlibre-1.9.3.tar.gz) = 18213632
Re: x11/pmenu:
On Sun, Mar 07, 2021 at 08:30:13PM +0100, Jerome KASPER wrote:
> Hi klemmens,
>
> First of all thanks for testing and reviewing.
> Nice spots in the grammar description.
> I will poke upstream about adding CFLAGS +=
> in the config.mk and will report back.
> I didn't knew about CPPFLAGS overriding with
> CFLAGS, is it a clang trick for debug?
No, that is just how this port's config.mk works:
$ tail $(make show=WRKSRC)/config.mk
INCS = -I${LOCALINC} -I${X11INC} -I${FREETYPEINC}
LIBS = -L${LOCALLIB} -L${X11LIB} -lm -lfontconfig -lXft -lX11
-lXinerama -lXrender -lXext -lImlib2
# flags
CPPFLAGS =
CFLAGS = -Wall -Wextra ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS}
# compiler and linker
CC = cc
So I simply overwrite the empty string via command line such that our
CFLAGS end up at the end of the port's CFLAGS.
Hence I wouldn't do this if config.mk actually used non-empty CPPFLAGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 12:34:41 Modified files: benchmarks/netperf-wrapper: Makefile distinfo benchmarks/netperf-wrapper/patches: patch-flent_build_info_py patch-setup_py benchmarks/netperf-wrapper/pkg: PLIST-gui PLIST-main Log message: update to flent-2.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 12:34:19 Modified files: net/fping : Makefile net/fping/patches: patch-src_fping_c Log message: don't use CLOCK_MONOTONIC for fping, it results in incorrect timestamps for fping -D. https://github.com/schweikert/fping/issues/216
Re: x11/pmenu:
Hi klemmens,
First of all thanks for testing and reviewing.
Nice spots in the grammar description.
I will poke upstream about adding CFLAGS +=
in the config.mk and will report back.
I didn't knew about CPPFLAGS overriding with
CFLAGS, is it a clang trick for debug?
Regards,
Jerome
Le dim. 7 mars 2021 à 20:02, Klemens Nanni a écrit :
> Without this the debug package is useless as it does not contain any
> symbols; build the port with and without the diff and note the
> addition of `-g' in cc(1) lines.
>
> I don't need the debug package or DEBUG at all right now but noticed
> the lack of `-O2 -pipe' when building this port.
>
> Fix DESCR grammar while here; I'm mailing the diff instead of
> committing it right away because I'm not sure if we want to deal this
> way with broken CFLAGS.
>
> Jerome, would you mind poking upstream about the CFLAGS handling in
> config.mk? If they'd simply use `CFLAGS += ...' in this file to append
> their stuff as needed, we could simply drop all the quirks in our
> MAKE_FLAGS and build the port with our framework's defaults, e.g. CFLAGS
> being honoured as passed through the environment, I think.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/pmenu/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile4 Mar 2021 22:46:21 - 1.1.1.1
> +++ Makefile7 Mar 2021 18:50:50 -
> @@ -5,6 +5,7 @@ COMMENT = contextual radial menu for X11
> GH_ACCOUNT = phillbush
> GH_PROJECT = pmenu
> GH_TAGNAME = v2.2.0
> +REVISION = 0
>
> CATEGORIES = x11
>
> @@ -25,6 +26,12 @@ NO_TEST =Yes
>
> MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
> MANPREFIX=${PREFIX}/man
> +
> +# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
> +# (`+=') not set (`=') variables.
> +# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and
> pass
> +# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to
> work.
> +MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/x11/pmenu/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 4 Mar 2021 22:46:21 - 1.1.1.1
> +++ pkg/DESCR 7 Mar 2021 18:36:33 -
> @@ -1,6 +1,7 @@
> -piemenu is a pie menu utility for X. It receives a menu specification OD
> +piemenu is a pie menu utility for X. It receives a menu specification
> in stdin, shows a menu for the user to select one of the options,
> and outputs the option selected to stdout.
> +
> Features include radial Submenus (some pie-menu slices can spawn another
> -menu), Icons (pie-menu slices can contain icon image),X resources support
> -and Root window mode
> +menu), Icons (pie-menu slices can contain icon image), X resources support
> +and Root window mode.
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/07 12:30:40 Modified files: devel/quirks/files: Quirks.pm Removed files: devel/quirks/files/Quirks: ghc.pm Log message: Remove obsolete ghc-specific quirks ghc 8.2.2 is such a distant past only CVS can remember it. ok kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/07 12:30:16 Modified files: infrastructure/bin: update-plist infrastructure/lib/OpenBSD: FS2.pm Log message: Remove GhcConf packing element as ghc-pkg-recache is no more These were previously used to automatically add tags to PLIST for Haskell library ports. Since library ports no longer exist, such tagging only ever triggers for ghc package where it is now harmful. ok kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gne...@cvs.openbsd.org 2021/03/07 12:29:41 Modified files: lang/ghc : Makefile Removed files: lang/ghc : ghc.port.mk Log message: Remove ghc.port.mk (copy the relevant parts into ghc/Makefile) OK kili
x11/pmenu:
Without this the debug package is useless as it does not contain any
symbols; build the port with and without the diff and note the
addition of `-g' in cc(1) lines.
I don't need the debug package or DEBUG at all right now but noticed
the lack of `-O2 -pipe' when building this port.
Fix DESCR grammar while here; I'm mailing the diff instead of
committing it right away because I'm not sure if we want to deal this
way with broken CFLAGS.
Jerome, would you mind poking upstream about the CFLAGS handling in
config.mk? If they'd simply use `CFLAGS += ...' in this file to append
their stuff as needed, we could simply drop all the quirks in our
MAKE_FLAGS and build the port with our framework's defaults, e.g. CFLAGS
being honoured as passed through the environment, I think.
Index: Makefile
===
RCS file: /cvs/ports/x11/pmenu/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile4 Mar 2021 22:46:21 - 1.1.1.1
+++ Makefile7 Mar 2021 18:50:50 -
@@ -5,6 +5,7 @@ COMMENT = contextual radial menu for X11
GH_ACCOUNT = phillbush
GH_PROJECT = pmenu
GH_TAGNAME = v2.2.0
+REVISION = 0
CATEGORIES = x11
@@ -25,6 +26,12 @@ NO_TEST =Yes
MAKE_FLAGS = FREETYPEINC=${X11BASE}/include/freetype2 \
MANPREFIX=${PREFIX}/man
+
+# ${WRKSRC}/config.mk ignores the environment, i.e. it should append to
+# (`+=') not set (`=') variables.
+# XXX CPPFLAGS is empty added to the end; abuse it to avoid patches and pass
+# CFLAGS such that DEBUG is honoured as required for DEBUG_PACKAGES to work.
+MAKE_FLAGS += CPPFLAGS='${CFLAGS}'
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pmenu
Index: pkg/DESCR
===
RCS file: /cvs/ports/x11/pmenu/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 4 Mar 2021 22:46:21 - 1.1.1.1
+++ pkg/DESCR 7 Mar 2021 18:36:33 -
@@ -1,6 +1,7 @@
-piemenu is a pie menu utility for X. It receives a menu specification OD
+piemenu is a pie menu utility for X. It receives a menu specification
in stdin, shows a menu for the user to select one of the options,
and outputs the option selected to stdout.
+
Features include radial Submenus (some pie-menu slices can spawn another
-menu), Icons (pie-menu slices can contain icon image),X resources support
-and Root window mode
+menu), Icons (pie-menu slices can contain icon image), X resources support
+and Root window mode.
[PATCH] lang/racket-minimal: add -E flag for raco exe
This patch adds the `-E` flag to racket version 7.9. This change
has been added upstream[1] as a restult of github issue 3717[2].
[1]:
https://github.com/racket/racket/commit/fac84630825fdb3780fcd7891fb50e637eb3f910
[2]: https://github.com/racket/racket/issues/3717
---
.../patches/patch-racket_exec_flag| 193 ++
1 file changed, 193 insertions(+)
create mode 100644 lang/racket-minimal/patches/patch-racket_exec_flag
diff --git lang/racket-minimal/patches/patch-racket_exec_flag
lang/racket-minimal/patches/patch-racket_exec_flag
new file mode 100644
index 000..f010c3f82f9
--- /dev/null
+++ lang/racket-minimal/patches/patch-racket_exec_flag
@@ -0,0 +1,193 @@
+diff --git src/bc/cmdline.inc src/bc/cmdline.inc
+index 8632a10479..b08b4e5a24 100644
+--- src/bc/cmdline.inc
src/bc/cmdline.inc
+@@ -768,6 +768,8 @@ static int run_from_cmd_line(int argc, char *_argv[],
+ argv[0] = "-m";
+ else if (!strcmp("--name", argv[0]))
+ argv[0] = "-N";
++else if (!strcmp("--exec", argv[0]))
++ argv[0] = "-E";
+ else if (!strcmp("--no-compiled", argv[0]))
+ argv[0] = "-c";
+ else if (!strcmp("--no-lib", argv[0]))
+@@ -1017,6 +1019,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
+ eval_kind[num_enl++] = mzcmd_EMBEDDED;
+ break;
+ case 'N':
++ case 'E':
+ if (argc < 2) {
+ PRINTF("%s: missing name after %s switch\n",
+ prog,
+@@ -1025,13 +1028,16 @@ static int run_from_cmd_line(int argc, char *_argv[],
+ }
+ argv++;
+ --argc;
+-sprog = argv[0];
+- if (!*sprog) {
++ if (!*(argv[0])) {
+ PRINTF("%s: empty path after %s switch\n",
+ prog,
+ real_switch);
+ goto show_need_help;
+ }
++ if (*str == 'N')
++sprog = argv[0];
++ else
++prog = argv[0];
+ was_config_flag = 1;
+ break;
+ case 'q':
+@@ -1439,6 +1445,7 @@ static int run_from_cmd_line(int argc, char *_argv[],
+ " -R , --compiled : Set compiled-file search roots
to \n"
+" -C, --cross : Cross-build mode; save current collects and config as
host\n"
+" -N , --name : Sets `(find-system-path 'run-file)' to
\n"
++ " -E , --exec : Sets `(find-system-path 'exec-file)' to
\n"
+ # ifdef CMDLINE_STDIO_FLAG
+ " -J , ---wm-class : Set WM_CLASS class to
(Unix)\n"
+ # endif
+diff --git src/cs/c/main.c src/cs/c/main.c
+index fcca0dcf0d..de5e564c91 100644
+--- src/cs/c/main.c
src/cs/c/main.c
+@@ -172,7 +172,7 @@ static char *get_self_path(char *exec_file)
+ # undef USE_GENERIC_GET_SELF_PATH
+ #endif
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ # include
+ # include
+ static char *get_self_path(char *exec_file)
+@@ -183,9 +183,15 @@ static char *get_self_path(char *exec_file)
+ int r;
+
+ mib[0] = CTL_KERN;
++#if defined(__NetBSD__)
++ mib[1] = KERN_PROC_ARGS;
++ mib[2] = getpid();
++ mib[3] = KERN_PROC_PATHNAME;
++#else
+ mib[1] = KERN_PROC;
+ mib[2] = KERN_PROC_PATHNAME;
+ mib[3] = -1;
++#endif
+
+ r = sysctl(mib, 4, NULL, , NULL, 0);
+ if (r < 0) {
+diff --git src/cs/main.sps src/cs/main.sps
+index d4f75b1104..8230fef269 100644
+--- src/cs/main.sps
src/cs/main.sps
+@@ -277,8 +277,8 @@
+ [else
+ (values (car args) (append (reverse accum) (cdr args)))])))
+
+- (define (check-path-arg what flag within-flag)
+- (when (equal? what "")
++ (define (check-path-arg path what flag within-flag)
++ (when (equal? path "")
+(error 'racket "empty ~a after ~a switch" what (or within-flag flag
+
+(define (raise-bad-switch arg within-arg)
+@@ -363,6 +363,7 @@
+ (let-values ([(file-name rest-args) (next-arg "file name" arg
within-arg args)])
+ (add-namespace-require-load! `(file ,file-name) file-name)
+ (no-init! saw)
++(check-path-arg file-name "file name" arg within-arg)
+ (set-run-file! (string->path file-name))
+ (flags-loop (cons "--" rest-args) (see saw 'non-config
'lib)))]
+ [("-f" "--load")
+@@ -374,6 +375,7 @@
+ (let-values ([(file-name rest-args) (next-arg "file name" arg
within-arg args)])
+ (set! loads (cons (lambda () (load file-name))
+ loads))
++(check-path-arg file-name "file name" arg within-arg)
+ (set-run-file! (string->path file-name))
+ (flags-loop (cons "--" rest-args) (see saw 'non-config)))]
+ [("-e" "--eval")
+@@ -458,18 +460,18 @@
+ (cond
+ [(equal? collects-path "")
+ (set! init-collects-dir 'disable)]
+- [else
+- (check-path-arg "collects path" arg within-arg)
++
fix print/scribus for poppler-21.03.0
Hi,
this fixes the build of scribus with poppler-21.03.0. Based on
upstream svn.
Ciao,
Kili
Index: patches/patch-scribus_plugins_import_pdf_slaoutput_cpp
===
RCS file:
/cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scribus_plugins_import_pdf_slaoutput_cpp
--- patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 21 Mar 2020
19:48:55 - 1.2
+++ patches/patch-scribus_plugins_import_pdf_slaoutput_cpp 7 Mar 2021
17:54:47 -
@@ -5,6 +5,8 @@ Fix build with newer poppler, from archl
Fix for poppler-0.86.x from svn r23478.
+Fix for poppler-21.03.x from svn r24537 and r24538.
+
Index: scribus/plugins/import/pdf/slaoutput.cpp
--- scribus/plugins/import/pdf/slaoutput.cpp.orig
+++ scribus/plugins/import/pdf/slaoutput.cpp
@@ -321,7 +323,29 @@ Index: scribus/plugins/import/pdf/slaout
}
void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
-@@ -3705,7 +3805,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo
+@@ -2208,8 +2308,11 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
+ return gTrue;
+ }
+
+-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int
tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070
double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog
*cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int
y1, double xStep, double yStep)
+ {
++ const double *bbox = tPat->getBBox();
++ const double *pmat = tPat->getMatrix();
++ Dict *resDict = tPat->getResDict();
+ PDFRectangle box;
+ Gfx *gfx;
+ QString id;
+@@ -2238,7 +2341,7 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state,
+
+ gfx = new Gfx(pdfDoc, this, resDict, , nullptr);
+ inPattern++;
+- gfx->display(str);
++ gfx->display(tPat->getContentStream());
+ inPattern--;
+ gElements = m_groupStack.pop();
+ m_doc->m_Selection->clear();
+@@ -3705,7 +3808,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotCo
return fNam;
}
@@ -330,7 +354,7 @@ Index: scribus/plugins/import/pdf/slaout
{
if (! path)
return QString();
-@@ -3715,7 +3815,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
+@@ -3715,7 +3818,7 @@ QString SlaOutputDev::convertPath(GfxPath *path)
for (int i = 0; i < path->getNumSubpaths(); ++i)
{
@@ -339,7 +363,7 @@ Index: scribus/plugins/import/pdf/slaout
if (subpath->getNumPoints() > 0)
{
output += QString("M %1
%2").arg(subpath->getX(0)).arg(subpath->getY(0));
-@@ -3917,6 +4017,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONS
+@@ -3917,6 +4020,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONS
u = s1->getChar(i) & 0xff;
++i;
}
Index: patches/patch-scribus_plugins_import_pdf_slaoutput_h
===
RCS file:
/cvs/ports/print/scribus/patches/patch-scribus_plugins_import_pdf_slaoutput_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scribus_plugins_import_pdf_slaoutput_h
--- patches/patch-scribus_plugins_import_pdf_slaoutput_h21 Mar 2020
19:48:55 - 1.2
+++ patches/patch-scribus_plugins_import_pdf_slaoutput_h7 Mar 2021
17:54:47 -
@@ -2,6 +2,8 @@ $OpenBSD: patch-scribus_plugins_import_p
Fix for poppler-0.86.x from svn r23478.
+Fix for poppler-21.03.x from svn r24537 and r24538.
+
Index: scribus/plugins/import/pdf/slaoutput.h
--- scribus/plugins/import/pdf/slaoutput.h.orig
+++ scribus/plugins/import/pdf/slaoutput.h
@@ -27,6 +29,15 @@ Index: scribus/plugins/import/pdf/slaout
static GBool annotations_callback(Annot *annota, void *user_data);
bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double
width, double height);
bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double
width, double height);
+@@ -189,7 +195,7 @@ class SlaOutputDev : public OutputDev (public)
+ void stroke(GfxState *state) override;
+ void fill(GfxState *state) override;
+ void eoFill(GfxState *state) override;
+- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object
*str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict
*resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int
x0, int y0, int x1, int y1, double xStep, double yStep) override;
++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat,
GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1,
double xStep, double
update print/poppler
Hi,
this updates poppler to 21.03.0. Tested on amd64. If noone complains or
wants me to wait longer, I'll commit this (together with a fix for
scribus) on wednesday.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile7 Dec 2020 21:31:24 - 1.164
+++ Makefile7 Mar 2021 17:54:35 -
@@ -4,7 +4,7 @@ COMMENT-main= PDF rendering library
COMMENT-qt5= Qt5 interface to PDF rendering library
COMMENT-utils= PDF conversion tools and utilities
-V= 20.12.0
+V= 21.03.0
DISTNAME= poppler-$V
CATEGORIES=print
PKGNAME-main= poppler-$V
@@ -13,9 +13,9 @@ PKGNAME-qt5= poppler-qt5-$V
EXTRACT_SUFX= .tar.xz
-SHARED_LIBS += poppler 68.0 # 105.0
+SHARED_LIBS += poppler 69.0 # 108.0
SHARED_LIBS += poppler-glib 19.8 # 8.19
-SHARED_LIBS += poppler-qt5 8.6 # 1.26
+SHARED_LIBS += poppler-qt5 8.7 # 1.27
SHARED_LIBS += poppler-cpp 16.2 # 0.9
HOMEPAGE= https://poppler.freedesktop.org/
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.88
diff -u -p -r1.88 distinfo
--- distinfo7 Dec 2020 21:31:24 - 1.88
+++ distinfo7 Mar 2021 17:54:35 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-20.12.0.tar.xz) = o5B1JcMuf/OV6vjPg++o1PUiuREoG4CChYb6gy/u+CQ=
-SIZE (poppler-20.12.0.tar.xz) = 1659844
+SHA256 (poppler-21.03.0.tar.xz) = /VHq1KrB0vRoT6bnsOwG8CM+0hZn5yCk6BfkRV3WPSc=
+SIZE (poppler-21.03.0.tar.xz) = 1690848
Index: patches/patch-poppler_Form_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_Form_cc,v
retrieving revision 1.7
diff -u -p -r1.7 patch-poppler_Form_cc
--- patches/patch-poppler_Form_cc 16 Jun 2020 20:24:05 - 1.7
+++ patches/patch-poppler_Form_cc 7 Mar 2021 17:54:35 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-poppler_Form_cc,v 1.7 20
Index: poppler/Form.cc
--- poppler/Form.cc.orig
+++ poppler/Form.cc
-@@ -34,6 +34,7 @@
+@@ -36,6 +36,7 @@
#include
#include
Index: patches/patch-poppler_XRef_cc
===
RCS file: /cvs/ports/print/poppler/patches/patch-poppler_XRef_cc,v
retrieving revision 1.24
diff -u -p -r1.24 patch-poppler_XRef_cc
--- patches/patch-poppler_XRef_cc 9 Sep 2020 20:16:44 - 1.24
+++ patches/patch-poppler_XRef_cc 7 Mar 2021 17:54:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-poppler_XRef_cc,v 1.24 2
Index: poppler/XRef.cc
--- poppler/XRef.cc.orig
+++ poppler/XRef.cc
-@@ -1044,7 +1044,7 @@ bool XRef::isRefEncrypted(Ref r)
+@@ -1061,7 +1061,7 @@ bool XRef::isRefEncrypted(Ref r)
bool XRef::okToPrint(bool ignoreOwnerPW) const
{
@@ -11,7 +11,7 @@ Index: poppler/XRef.cc
}
// we can print at high res if we are only doing security handler revision
-@@ -1052,48 +1052,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
+@@ -1069,48 +1069,37 @@ bool XRef::okToPrint(bool ignoreOwnerPW) const
// 3 and we are allowed to print, and bit 12 is set.
bool XRef::okToPrintHighRes(bool ignoreOwnerPW) const
{
Index: patches/patch-qt5_src_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-qt5_src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-qt5_src_CMakeLists_txt
--- patches/patch-qt5_src_CMakeLists_txt7 Dec 2020 21:31:24 -
1.3
+++ patches/patch-qt5_src_CMakeLists_txt7 Mar 2021 17:54:35 -
@@ -5,11 +5,11 @@ $OpenBSD: patch-qt5_src_CMakeLists_txt,v
Index: qt5/src/CMakeLists.txt
--- qt5/src/CMakeLists.txt.orig
+++ qt5/src/CMakeLists.txt
-@@ -40,7 +40,6 @@ set(poppler_qt5_SRCS
+@@ -37,7 +37,6 @@ set(poppler_qt5_SRCS
poppler-version.cpp
)
add_library(poppler-qt5 ${poppler_qt5_SRCS})
--set_target_properties(poppler-qt5 PROPERTIES VERSION 1.26.0 SOVERSION 1)
+-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.27.0 SOVERSION 1)
if(MINGW AND BUILD_SHARED_LIBS)
get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION)
set_target_properties(poppler-qt5 PROPERTIES SUFFIX
"-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
Index: patches/patch-utils_CMakeLists_txt
===
RCS file: /cvs/ports/print/poppler/patches/patch-utils_CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -r1.4 patch-utils_CMakeLists_txt
--- patches/patch-utils_CMakeLists_txt 9 Sep 2020 20:16:44 - 1.4
+++ patches/patch-utils_CMakeLists_txt 7 Mar 2021 17:54:35 -
@@ -6,7 +6,7 @@ up any already installed older version o
Index: utils/CMakeLists.txt
--- utils/CMakeLists.txt.orig
+++ utils/CMakeLists.txt
-@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/07 10:54:50 Modified files: sysutils/loki : Makefile distinfo sysutils/loki/patches: patch-cmd_loki_loki-local-config_yaml sysutils/loki/pkg: PLIST loki.rc Log message: sysutils/loki: update to 2.1.0. many improvements since 1.4.1, cf https://github.com/grafana/loki/releases/tag/v2.0.0 and https://github.com/grafana/loki/releases/tag/v2.1.0. add daemon_logger="daemon.info", from sthen@ ok sthen@
arm bulk build report
bulk build on armv7.ports.openbsd.org started on Tue Jan 19 03:41:17 MST 2021 finished at Sun Mar 7 10:51:28 MST 2021 lasted 17D07h10m done with kern.version=OpenBSD 6.8-current (GENERIC) #364: Sun Jan 17 22:28:08 MST 2021 built packages:8806 Jan 19:281 Jan 20:186 Jan 21:40 Jan 22:81 Jan 25:250 Jan 26:323 Jan 28:202 Jan 29:154 Jan 30:167 Jan 31:11 Feb 1:1739 Feb 2:1137 Feb 3:342 Feb 4:224 Feb 5:93 Feb 6:15 Feb 7:127 Feb 8:190 Feb 9:65 Feb 10:35 Feb 11:68 Feb 12:392 Feb 13:102 Feb 14:502 Feb 15:148 Feb 16:74 Feb 17:75 Feb 18:71 Feb 19:219 Feb 20:77 Feb 21:115 Feb 22:109 Feb 23:168 Feb 24:157 Feb 25:118 Feb 26:127 Feb 27:127 Feb 28:126 Mar 1:119 Mar 2:50 Mar 3:186 Mar 4:159 Mar 5:384 Mar 6:1181 Mar 7:1099 critical path missing pkgs: http://build-failures.rhaalovely.net/arm/2021-01-19/summary.log build failures: 83 http://build-failures.rhaalovely.net/arm/2021-01-19/audio/picard.log http://build-failures.rhaalovely.net/arm/2021-01-19/audio/puddletag.log http://build-failures.rhaalovely.net/arm/2021-01-19/cad/yosys.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/coccigrep.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/doc++.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/dyncall.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/glog.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/liboil.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/ptlib.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/py-cflow2dot.log http://build-failures.rhaalovely.net/arm/2021-01-19/devel/spyder/spyder,python3.log http://build-failures.rhaalovely.net/arm/2021-01-19/editors/kakoune.log http://build-failures.rhaalovely.net/arm/2021-01-19/editors/zile.log http://build-failures.rhaalovely.net/arm/2021-01-19/emulators/dgen-sdl,debugger.log http://build-failures.rhaalovely.net/arm/2021-01-19/emulators/gns3.log http://build-failures.rhaalovely.net/arm/2021-01-19/emulators/higan.log http://build-failures.rhaalovely.net/arm/2021-01-19/emulators/ppsspp.log http://build-failures.rhaalovely.net/arm/2021-01-19/emulators/spike.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/barony.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/f1spirit.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/hyperrogue.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/shockolate.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/solarus/roth.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/solarus/zsdx.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/solarus/zsxd.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/stockfish.log http://build-failures.rhaalovely.net/arm/2021-01-19/games/stone-soup,no_x11.log http://build-failures.rhaalovely.net/arm/2021-01-19/geo/osm2pgrouting.log http://build-failures.rhaalovely.net/arm/2021-01-19/geo/pgrouting.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/gnofract4d.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/gprof2dot.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/py-dot.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/py-pyx,python3.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/py-seaborn,python3.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/xdot.log http://build-failures.rhaalovely.net/arm/2021-01-19/graphics/xfig.log http://build-failures.rhaalovely.net/arm/2021-01-19/inputmethods/uim.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/STk.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/gerbil.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/guile2.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/hashlink.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/janet.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/nekovm.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/parrot.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/racket-minimal,no_jit.log http://build-failures.rhaalovely.net/arm/2021-01-19/lang/swi-prolog.log http://build-failures.rhaalovely.net/arm/2021-01-19/mail/bogofilter,db4.log http://build-failures.rhaalovely.net/arm/2021-01-19/mail/courier-unicode.log http://build-failures.rhaalovely.net/arm/2021-01-19/math/mathomatic.log http://build-failures.rhaalovely.net/arm/2021-01-19/math/py-scikit-image,python3.log http://build-failures.rhaalovely.net/arm/2021-01-19/misc/freeopcua/opcua-client-gui.log http://build-failures.rhaalovely.net/arm/2021-01-19/misc/freeopcua/py-opcua-widgets.log http://build-failures.rhaalovely.net/arm/2021-01-19/misc/osinfo/libosinfo.log http://build-failures.rhaalovely.net/arm/2021-01-19/misc/osinfo/osinfo-db-tools.log http://build-failures.rhaalovely.net/arm/2021-01-19/multimedia/gstreamer-0.10/plugins-ffmpeg.log http://build-failures.rhaalovely.net/arm/2021-01-19/net/bro.log
Re: [update] loki 2.1.0
On Sat, Mar 06, 2021 at 01:12:30PM +, Stuart Henderson wrote: > On 2021/03/05 14:29, Landry Breuil wrote: > > On Fri, Mar 05, 2021 at 02:20:58PM +0100, Landry Breuil wrote: > > > Hi, > > > > > > > > > here's an update to loki 2.1.0, cf > > > https://github.com/grafana/loki/releases/ for the various relnotes since > > > the 1.4.1 we're having now. Totally untested on OpenBSD, but im using it > > > on debian .. so might as well update the port. > > > > Even better with non-ether diff. > > OK. > > While you're there, can you add daemon_logger="daemon.info" to loki.rc please? Hah, nice idea ! > (Not for promtail though, it could end up in a nasty loop..) yeah, that would quickly lead to a log exhaustion i think.. > Pity promtail's syslog-over-TCP ingester (which uses influxdata/go-syslog) > only does RFC5424 and doesn't work with messages from OpenBSD syslogd though.. > > level=warn ts=2021-03-06T12:39:18.055119653Z caller=syslogtarget.go:183 > msg="error parsing syslog stream" err="expecting a version value in the range > 1-999 [col 7]" yeah it's a bit sad, the syslog sink was discussed in https://github.com/grafana/loki/issues/935 upstream and https://github.com/grafana/loki/issues/935#issuecomment-554960778 clearly states that 'Ingest BSD syslog (RFC3164) / ingest over UDP' isnt supported. In my usecase on debian with nginx (which only logs to syslog over UDP) i resorted to use rsyslog as a forwarder, listening to nginx logs (already formatted as json) and forwarding them to promtail using omfwd module, cf https://grafana.com/docs/loki/latest/clients/promtail/scraping/#rsyslog-output-configuration that quickly allows to do nifty things such as https://grafana.com/grafana/dashboards/12559 Landry
Re: ghc 8.10.3 updates
Hi Greg, On Sat, Mar 06, 2021 at 12:32:10PM -0800, Greg Steuck wrote: > Once the other 3 cleanup patches are applied we can proceed with this > update which will take us to ghc-8.10.3. I'm double-checking that all > Haskell ports still work on amd64, but it seems like a fairly limited > affar. We should be able to finish in the next week if all goes well. Thanks. I'll give it a try on i386 and hope to get results on tuesday or wednesday. Ciao, Kili
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org 2021/03/07 10:33:37
Modified files:
geo/osm2pgsql : Makefile distinfo
geo/osm2pgsql/patches: patch-CMakeLists_txt
patch-docs_osm2pgsql_1
Added files:
geo/osm2pgsql/patches: patch-docs_CMakeLists_txt
patch-src_options_cpp
patch-src_options_hpp
Removed files:
geo/osm2pgsql/patches: patch-options_cpp
patch-tests_regression-test_py
Log message:
geo/osm2pgsql: update to 1.4.1.
new website at https://osm2pgsql.org/
https://github.com/openstreetmap/osm2pgsql/issues/922 was fixed so this
now builds against upcoming devel/proj 8 update.
use MODPOSTGRESQL_TEST_CMD = ${MODCMAKE_TEST_TARGET} to run the tests
using the cmake goop, pleasantly surprised to see that this works !
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/07 10:28:55 Modified files: geo/libosmium : Makefile distinfo geo/libosmium/pkg: PLIST Added files: geo/libosmium/patches: patch-include_osmium_io_gzip_compression_hpp Removed files: geo/libosmium/patches: patch-include_osmium_io_bzip2_compression_hpp Log message: geo/libosmium: update to 2.16.0 drops dependency on devel/proj, cf https://github.com/osmcode/libosmium/issues/277 add a patch to build with our zlib (needs gzclose_r/w, gzclose is enough), hint from sthen@. ok bentley@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/07 10:28:13 Modified files: inputmethods/ibus: Makefile distinfo inputmethods/ibus/patches: patch-client_gtk2_ibusimcontext_c inputmethods/ibus/pkg: DESCR Removed files: inputmethods/ibus/patches: patch-ui_gtk3_application_vala patch-ui_gtk3_extension_vala Log message: Update to ibus-1.5.24.
Re: Remaining bits of ghc.port.mk cleanup
Hi Greg,
On Thu, Mar 04, 2021 at 09:09:03PM -0800, Greg Steuck wrote:
> The attached three patches should complete the cleanup. Let me know if I
> missed anything. We can then move on to ghc 8.10 upgrade.
>
> I rebuilt lang/ghc with the patches applied on amd64. I expect the
> change to be a no-op in terms of generated package and so didn't bump
> the revision. Maybe I still should?
Looks fine. If everything still works for you, go ahead.
CIao,
Kili
> >From 888e694a7e8d07299c61945c516bfa7fa8e95fbd Mon Sep 17 00:00:00 2001
> From: Greg Steuck
> Date: Sat, 3 Oct 2020 20:45:05 -0700
> Subject: [PATCH 1/3] Remove ghc.port.mk (copy the relevant parts into
> ghc/Makefile)
>
> ---
> lang/ghc/Makefile| 21 +++
> lang/ghc/ghc.port.mk | 145 ---
> 2 files changed, 10 insertions(+), 156 deletions(-)
> delete mode 100644 lang/ghc/ghc.port.mk
>
> diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
> index 6be97a658fc..38081709957 100644
> --- a/lang/ghc/Makefile
> +++ b/lang/ghc/Makefile
> @@ -10,8 +10,8 @@ COMMENT = compiler for the functional language
> Haskell
>
> # ghc hardcodes ${WRKDIR}/bin/gcc when the package is compiled with ccache
> NO_CCACHE = Yes
> -
> -DISTNAME = ghc-${MODGHC_VER}
> +GHC_VERSION =8.6.4
> +DISTNAME = ghc-${GHC_VERSION}
> REVISION = 9
> CATEGORIES = lang devel
> HOMEPAGE = https://www.haskell.org/ghc/
> @@ -19,9 +19,8 @@ HOMEPAGE = https://www.haskell.org/ghc/
> # Version of the precompiled binaries
> BIN_VER =8.6.4.20200921
>
> -# Pull in lang/ghc to get MODGHC_VER and ONLY_FOR_ARCHS, which is maintained
> -# in ghc.port.mk. lang/python needed for regression tests.
> -MODULES =lang/ghc lang/python
> +# lang/python needed for regression tests.
> +MODULES =lang/python
>
> MODPY_BUILDDEP = No
> MODPY_RUNDEP = No
> @@ -47,7 +46,7 @@ RUN_DEPENDS =
> # loadObj_() instead.
> USE_WXNEEDED = special
>
> -MASTER_SITES = ${HOMEPAGE}dist/${MODGHC_VER}/ \
> +MASTER_SITES = ${HOMEPAGE}dist/${GHC_VERSION}/ \
> ${HOMEPAGE}dist/stable/dist/
> MASTER_SITES0 = https://openbsd.dead-parrot.de/distfiles/
>
> @@ -55,8 +54,8 @@ DIST_SUBDIR = ghc
>
> BINDISTFILE =${BINDISTFILE-${MACHINE_ARCH}}
>
> -DISTFILES = ghc-${MODGHC_VER}-src.tar.xz \
> - ghc-${MODGHC_VER}-testsuite.tar.xz \
> +DISTFILES = ghc-${GHC_VERSION}-src.tar.xz \
> + ghc-${GHC_VERSION}-testsuite.tar.xz \
> ${BINDISTFILE}
>
> .for m in amd64 i386
> @@ -229,11 +228,11 @@ _bootstrap_prepare:
> echo ${BOOTSTRAP_DATE} > ${WRKSRC}/VERSION_DATE
>
> _bootstrap_finish:
> - mkdir -p ${WRKBUILD}/ghc-${MODGHC_VER}.${BOOTSTRAP_DATE}-shlibs-$$(arch
> -s)
> + mkdir -p
> ${WRKBUILD}/ghc-${GHC_VERSION}.${BOOTSTRAP_DATE}-shlibs-$$(arch -s)
> ldd ${WRKBUILD}/ghc/stage2/build/tmp/ghc-stage2 | \
> awk '$$NF ~ /^\/usr\/(local\/)?lib\// { print $$NF }' | \
> - xargs -J % cp -p %
> ${WRKBUILD}/ghc-${MODGHC_VER}.${BOOTSTRAP_DATE}-shlibs-$$(arch -s)
> + xargs -J % cp -p %
> ${WRKBUILD}/ghc-${GHC_VERSION}.${BOOTSTRAP_DATE}-shlibs-$$(arch -s)
> cd ${WRKBUILD} && \
> - pax -wzf ghc-${MODGHC_VER}.${BOOTSTRAP_DATE}-shlibs-$$(arch
> -s){.tar.gz,}
> + pax -wzf ghc-${GHC_VERSION}.${BOOTSTRAP_DATE}-shlibs-$$(arch
> -s){.tar.gz,}
>
> .include
> diff --git a/lang/ghc/ghc.port.mk b/lang/ghc/ghc.port.mk
> deleted file mode 100644
> index 5bcc973f593..000
> --- a/lang/ghc/ghc.port.mk
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -# $OpenBSD: ghc.port.mk,v 1.45 2019/12/02 23:32:29 kili Exp $
> -# Module for Glasgow Haskell Compiler
> -
> -# Not yet ported to other architectures
> -ONLY_FOR_ARCHS = i386 amd64
> -
> -# Dependency of meta/haskell-platform.
> -# Please do *not* update without thinking.
> -MODGHC_VER = 8.6.4
> -SUBST_VARS +=MODGHC_VER
> -
> -MODGHC_BIN = ${LOCALBASE}/bin/ghc
> -
> -# The following is for depending ports only. GHC itself just needs
> -# MODGHC_VER and ONLY_FOR_ARCHS. This is a little bit ugly, but
> -# depending ports using CABAL tend to install into locations as
> -# lib/Foo-${FooVersion}/ghc-${MODGHC_VER}, so they need the exact
> -# version of ghc. Depending ports thus need full depends specs,
> -# i.e. RUN_DEPENDS = lang/ghc=${MODGHC_VER}, and not
> -# just lang/ghc.
> -.if ${PKGPATH} != "lang/ghc"
> -BUILD_DEPENDS += lang/ghc
> -
> -# There seems to be a race condition in ghc-pkg (for ghc-8.6) which
> -# is triggered when a port build runs ghc-pkg recache while dpb(1)
> -# recycles unused hs-packages.
> -DPB_PROPERTIES +=nojunk
> -
> -# Set to "cabal" to get the typical Cabal targets defined. Add "haddock"
> -# to generate API
Re: childsplay needs py-numpy
On Sun, Mar 07, 2021 at 02:34:51PM +, Stuart Henderson wrote:
> On 2021/03/07 13:12, Remi Locherer wrote:
> > Without numpy childsplay fails to start (see cairoimage.py).
> >
> > OK?
>
> ok. I wonder if we should split off a py2-numpy..
Actually, there is a version 3.3 from 2018 that does not need numpy.
It still depends on Python 2 though ...
Changelog:
https://git.savannah.nongnu.org/cgit/childsplay.git/tree/Changelog
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile7 Mar 2021 15:26:03 - 1.32
+++ Makefile7 Mar 2021 16:45:33 -
@@ -2,9 +2,8 @@
COMMENT= collection of educational activities for young children
-DISTNAME= childsplay-2.6.5
+DISTNAME= childsplay-3.3
EXTRACT_SUFX= .tgz
-REVISION = 4
CATEGORIES=games education
@@ -23,7 +22,6 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS= databases/py-sqlalchemy \
devel/pygame \
- math/py-numpy \
x11/py-gtk2
NO_TEST= Yes
@@ -32,7 +30,6 @@ NO_BUILD= Yes
MODPY_ADJ_FILES=childsplay.py
pre-configure:
- perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/pangofont.py
echo '#!/bin/sh' >${WRKSRC}/childsplay.sh
echo >>${WRKSRC}/childsplay.sh
echo 'cd ${MODPY_SITEPKG}/childsplay' >>${WRKSRC}/childsplay.sh
@@ -46,7 +43,7 @@ do-install:
cp -Rp ${WRKSRC}/locale ${PREFIX}/share
${INSTALL_DATA} ${WRKSRC}/sp_content.db \
${WRKINST}/${MODPY_SITEPKG}/childsplay
-.for i in SPWidgets alphabetsounds lib
+.for i in SPWidgets alphabet-sounds lib
cp -Rp ${WRKSRC}/$i ${WRKINST}/${MODPY_SITEPKG}/childsplay
.endfor
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: distinfo
===
RCS file: /cvs/ports/games/childsplay/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo12 Sep 2014 06:37:12 - 1.7
+++ distinfo7 Mar 2021 16:45:33 -
@@ -1,2 +1,2 @@
-SHA256 (childsplay-2.6.5.tgz) = FrIy2z4YBuN3SOz1Y1I8/X2nj+a4amJcY+WJk7c8qIo=
-SIZE (childsplay-2.6.5.tgz) = 24091891
+SHA256 (childsplay-3.3.tgz) = Pcve+HIVBa3VqBH1BKZVk0upHUvIWgtt7ZMPRH68Ogc=
+SIZE (childsplay-3.3.tgz) = 33297165
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/childsplay/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 6 Jul 2014 09:09:10 - 1.4
+++ pkg/PLIST 7 Mar 2021 16:45:34 -
@@ -62,8 +62,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/dialogs.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.py
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/funcs.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.py
-lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/gtk_widgets.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.py
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/test.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/SPWidgets/text.py
@@ -80,59 +78,1039 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/childsplay/Version.pyc
lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.py
lib/python${MODPY_VERSION}/site-packages/childsplay/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/10.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/11.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/12.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/13.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/14.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/15.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/16.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/17.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/18.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/19.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/20.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0030.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0031.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0032.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0033.ogg
-lib/python${MODPY_VERSION}/site-packages/childsplay/alphabetsounds/en/U0034.ogg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/03/07 10:11:34 Modified files: graphics/fna3d : Makefile distinfo graphics/fna3d/patches: patch-CMakeLists_txt graphics/fna3d/pkg: PLIST Log message: update to FNA3D 21.03. Bump major. Tested with Unexplored. Changelog: 21.03 New Features: * Added support for tracing FNA3D call streams. FNA3D binaries built with tracing enabled will capture FNA3D calls and serialize them to a file, which can be played back on any platform and renderer with the program found in the replay/ folder. Note that these traces contains texture/buffer data, so be careful to respect copyrights regarding game data! Fixes: * Fix a possible crash when calling SetRenderTargets with 0 targets but a non-null target array * Micro-optimize OpenGL thread commands by skipping the round-trip through the public FNA3D API * Continued work on the Vulkan pre-release 21.02 New Features: * Added FNA3D_SysRenderer.h, which contains extensions for external graphics middleware interop Fixes: * Fix VPOS for OpenGL ES contexts * Pipeline cache data is now properly invalidated when associated shaders are deleted * Wrap-up work on the Vulkan beta, now in the release candidate stage ** Added FNA3D_VULKAN_MEMORY_REQUIREMENT ** Added FNA3D_VULKAN_PIPELINE_CACHE_FILE_NAME
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/03/07 10:09:36
Modified files:
graphics/mojoshader: Makefile distinfo
Log message:
update to changeset 1321. Only minimal change - documented as:
spirv: Work around OpLogicalNot being unsupported for ints
Tested with Unexplored.
Index: Makefile
===
RCS file: /cvs/ports/graphics/mojoshader/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile23 Jan 2021 17:56:27 - 1.10
+++ Makefile7 Mar 2021 15:58:38 -
@@ -3,8 +3,8 @@
COMMENT = library to move calls to Direct3D shaders to OpenGL
# HG_CHANGESET and HG_COMMIT must be kept in sync.
-HG_CHANGESET = 1320
-HG_COMMIT =f9036699b53a
+HG_CHANGESET = 1321
+HG_COMMIT =02f2aafb103c
DISTNAME = mojoshader-${HG_COMMIT}{${HG_COMMIT}}
PKGNAME = mojoshader-${HG_CHANGESET}
Index: distinfo
===
RCS file: /cvs/ports/graphics/mojoshader/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo23 Jan 2021 17:56:27 - 1.5
+++ distinfo7 Mar 2021 15:58:38 -
@@ -1,2 +1,2 @@
-SHA256 (mojoshader-f9036699b53a.tar.gz) =
fi3PdnaN3J6VBH99mJAEZ5YiKRnLptzlNLDxuWewr6s=
-SIZE (mojoshader-f9036699b53a.tar.gz) = 466291
+SHA256 (mojoshader-02f2aafb103c.tar.gz) =
UbCB4dyT4whIlXGav+8QE+7AW8OS94ijvbYGaZmGZvc=
+SIZE (mojoshader-02f2aafb103c.tar.gz) = 466287
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/03/07 10:08:38 Modified files: x11/xfce4/thunar: Makefile distinfo Log message: x11/xfce4/thunar: update to 4.16.4. See https://mail.xfce.org/pipermail/xfce-announce/2021-March/001017.html
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/03/07 10:07:19 Modified files: audio/faudio : Makefile distinfo Log message: update to FAudio 21.03.05. Only internal symbol changes; no bump. Tested working with Unexplored. Changelog: 21.03.05 Fixes a regression that caused SoundBanks to no longer parse correctly 21.03 New Features: * XACT: ** Implemented FACT_FLAG_MANAGEDATA ** Implemented the CUEPLAY and CUESTOP notification types ** Added support for XACT 3.0 content ** Added support for WaveBanks with endian-swapped PCM data 21.02 New Features: * XACT: All notification types with the PERSIST flag are now recorded
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/03/07 10:04:31 Modified files: games/fna : Makefile distinfo Log message: update to FNA 21.03.05. Tested with Unexplored without issues. Changelog: 21.03.05 Emergency update to FAudio 21.03.05 21.03 New Features: * Added a .editorconfig, in the hopes that VS/JetBrains will have an easier time matching code style * Update to FNA3D 21.03 * Update to FAudio 21.03 Fixes: * Use Unicode.GetString for FACTRendererDetails, works around a BRUTE issue * XACT data is now loaded to native memory rather than managed, avoids some annoying GC behavior 21.02 New Features: * Update to FNA3D 21.02 * By default, support for the FNA3D Vulkan pipeline cache is limited to desktop only * Update to FAudio 21.02 Fixes: * Visual Studio fixes for AnyCPU and app.config * Fix for possible graphics spec violations in the VideoPlayer * Sampler state is now updated when calling SetRenderTargets * GraphicsDeviceManager device callbacks now pass the GDM as sender, not the GraphicsDevice
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2021/03/07 10:02:15 Modified files: games/libgdx : Makefile games/libgdx/patches: patch-gdx_jni_build-linux64_xml Log message: Remove previously missed gcc invocation, noticed by sthen@ fix M_ARCH extension for i386 build and run tested on amd64
Re: [UPDATE] devel/adb
On Sat, Mar 06, 2021 at 04:05:20PM +, Wind R wrote: > Running adbd as root seems to cause a kernel panic. > I have attached a picture of the ddb log. > > I am unable to use my keyboard after the kernel panic, > devices connected to the USB ports after the panic won't be powered > either. > > I am able to consistently reproduce it by using "doas adb devices". > My phone is attached to the machine when I execute the command. > Usually the kernel panic occurs almost immediately after, however > on one instance, it did not panic until a few seconds after. > > > Sent with ProtonMail Secure Email. > Though I cannot recreate this, there is certainly a fix required for adb through usb. You can try the same with existing adb version see if it leads to something similar. I've gave up on this port since there is little hope for any future update considering the many disparate repos the source code is strewn across. And with no tarballs! regards, Dimitri
[UPDATE] audio/ncspot to 0.5.0
Attached diff updates ncspot to 0.5.0
Changelog: https://github.com/hrkfdn/ncspot/releases/tag/v0.5.0
Had to disable player notifications for this release on OpenBSD due to a newly
introduced incompatibility in a dependency. It's already fixed upstream,
hopefully it can be reenabled for the next release.
OK?? licenses
Index: Makefile
===
RCS file: /cvs/ports/audio/ncspot/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile16 Feb 2021 19:34:00 - 1.13
+++ Makefile7 Mar 2021 16:24:32 -
@@ -6,7 +6,7 @@ COMMENT = ncurses Spotify client
GH_ACCOUNT = hrkfdn
GH_PROJECT = ncspot
-GH_TAGNAME = v0.4.0
+GH_TAGNAME = v0.5.0
CATEGORIES = audio
@@ -29,7 +29,7 @@ CONFIGURE_STYLE = cargo
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
MODCARGO_CRATES += addr2line 0.14.1 # Apache-2.0/MIT
-MODCARGO_CRATES += adler 0.2.3 # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0
MODCARGO_CRATES += aes 0.3.2 # MIT OR Apache-2.0
MODCARGO_CRATES += aes-ctr 0.3.0 # MIT OR Apache-2.0
MODCARGO_CRATES += aes-soft0.3.3 # MIT OR Apache-2.0
@@ -44,6 +44,7 @@ MODCARGO_CRATES +=approx 0.3.2 # Apache
MODCARGO_CRATES += array-macro 1.0.5 # MIT/Apache-2.0
MODCARGO_CRATES += arrayref0.3.6 # BSD-2-Clause
MODCARGO_CRATES += arrayvec0.5.2 # MIT/Apache-2.0
+MODCARGO_CRATES += async-io1.3.1 # Apache-2.0 OR MIT
MODCARGO_CRATES += atty0.2.14 # MIT
MODCARGO_CRATES += autocfg 0.1.7 # Apache-2.0/MIT
MODCARGO_CRATES += autocfg 1.0.1 # Apache-2.0 OR MIT
@@ -61,22 +62,24 @@ MODCARGO_CRATES += block 0.1.6 # MIT
MODCARGO_CRATES += block-buffer0.7.3 # MIT OR Apache-2.0
MODCARGO_CRATES += block-cipher-trait 0.6.2 # MIT OR Apache-2.0
MODCARGO_CRATES += block-padding 0.1.5 # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.6.0 # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.6.1 # MIT/Apache-2.0
MODCARGO_CRATES += byte-tools 0.3.1 # MIT OR Apache-2.0
MODCARGO_CRATES += byteorder 1.4.2 # Unlicense OR MIT
MODCARGO_CRATES += bytes 0.4.12 # MIT
MODCARGO_CRATES += bytes 0.5.6 # MIT
MODCARGO_CRATES += bytes 1.0.1 # MIT
-MODCARGO_CRATES += cc 1.0.66 # MIT/Apache-2.0
+MODCARGO_CRATES += cache-padded1.1.1 # Apache-2.0 OR MIT
+MODCARGO_CRATES += cc 1.0.67 # MIT/Apache-2.0
MODCARGO_CRATES += cexpr 0.4.0 # Apache-2.0/MIT
MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
MODCARGO_CRATES += chrono 0.4.19 # MIT/Apache-2.0
-MODCARGO_CRATES += clang-sys 1.0.3 # Apache-2.0
+MODCARGO_CRATES += clang-sys 1.1.1 # Apache-2.0
MODCARGO_CRATES += clap2.33.3 # MIT
MODCARGO_CRATES += clipboard 0.5.0 # MIT / Apache-2.0
MODCARGO_CRATES += clipboard-win 2.2.0 # MIT
MODCARGO_CRATES += cloudabi0.0.3 # BSD-2-Clause
+MODCARGO_CRATES += concurrent-queue1.2.2 # Apache-2.0 OR MIT
MODCARGO_CRATES += constant_time_eq0.1.5 # CC0-1.0
MODCARGO_CRATES += cookie 0.12.0 # MIT/Apache-2.0
MODCARGO_CRATES += cookie_store0.7.0 # MIT/Apache-2.0
@@ -92,7 +95,7 @@ MODCARGO_CRATES +=crossbeam-deque 0.7.3
MODCARGO_CRATES += crossbeam-epoch 0.8.2 # MIT/Apache-2.0
MODCARGO_CRATES += crossbeam-queue 0.2.3 # MIT/Apache-2.0 AND
BSD-2-Clause
MODCARGO_CRATES += crossbeam-utils 0.7.2 # MIT/Apache-2.0
-MODCARGO_CRATES += crossbeam-utils 0.8.1 # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.3 # MIT OR Apache-2.0
MODCARGO_CRATES += crypto-mac 0.7.0 # MIT OR Apache-2.0
MODCARGO_CRATES += ctr 0.3.2 # MIT OR Apache-2.0
MODCARGO_CRATES += cursive 0.16.3 # MIT
@@ -103,8 +106,9 @@ MODCARGO_CRATES += darling_core0.9.0 #
MODCARGO_CRATES += darling_core0.10.2 # MIT
MODCARGO_CRATES += darling_macro 0.9.0 # MIT
MODCARGO_CRATES += darling_macro 0.10.2 # MIT
-MODCARGO_CRATES += dbus0.9.1 # Apache-2.0/MIT
+MODCARGO_CRATES += dbus0.9.2 # Apache-2.0/MIT
MODCARGO_CRATES += dbus-tree 0.9.0 # Apache-2.0/MIT
+MODCARGO_CRATES += derivative 2.2.0 # MIT/Apache-2.0
MODCARGO_CRATES += derive_builder 0.7.2 # MIT/Apache-2.0
MODCARGO_CRATES += derive_builder_core 0.5.0 # MIT/Apache-2.0
MODCARGO_CRATES += digest 0.8.1 # MIT OR Apache-2.0
@@ -114,35 +118,39 @@ MODCARGO_CRATES +=dirs-sys-next 0.1.2 #
MODCARGO_CRATES += dotenv 0.13.0 # MIT
MODCARGO_CRATES += dtoa0.4.7 # MIT OR Apache-2.0
MODCARGO_CRATES += either 1.6.1 # MIT/Apache-2.0
-MODCARGO_CRATES +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/03/07 08:26:03 Modified files: games/childsplay: Makefile Log message: games/childsplay requires numpy to run (see cairoimage.py). OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:52:17 Modified files: games/lwjgl3 : Makefile Log message: mark broken on i386
Re: childsplay needs py-numpy
On 2021/03/07 13:12, Remi Locherer wrote:
> Without numpy childsplay fails to start (see cairoimage.py).
>
> OK?
ok. I wonder if we should split off a py2-numpy..
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/childsplay/Makefile,v
> retrieving revision 1.31
> diff -u -p -r1.31 Makefile
> --- Makefile 23 Feb 2021 19:39:22 - 1.31
> +++ Makefile 7 Mar 2021 11:41:22 -
> @@ -4,7 +4,7 @@ COMMENT= collection of educational activ
>
> DISTNAME=childsplay-2.6.5
> EXTRACT_SUFX=.tgz
> -REVISION = 3
> +REVISION = 4
>
> CATEGORIES= games education
>
> @@ -23,6 +23,7 @@ BUILD_DEPENDS= ${_MODPY_BUILD_DEPENDS}
>
> RUN_DEPENDS= databases/py-sqlalchemy \
> devel/pygame \
> + math/py-numpy \
> x11/py-gtk2
>
> NO_TEST= Yes
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:28:43 Modified files: www/p5-libapreq2: Makefile distinfo www/p5-libapreq2/pkg: PLIST Removed files: www/p5-libapreq2/patches: patch-glue_perl_t_conf_extra_conf_in patch-module_t_conf_extra_conf_in Log message: update to p5-libapreq2-2.15
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:28:25 Modified files: mail/mutt : Makefile distinfo Log message: update to mutt-2.0.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:27:32 Modified files: graphics/py-Pillow: Makefile distinfo Log message: update to py3-Pillow-8.1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:22:33 Modified files: textproc/py-sphinx: Makefile distinfo textproc/py-sphinx/pkg: PLIST Log message: update to py3-sphinx-3.5.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:17:03 Modified files: mail : Makefile mail/rspamd: Makefile mail/rspamd/pkg: DESCR Log message: add hyperscan flavour of rspamd for amd64.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:16:30 Modified files: textproc : Makefile Log message: +hyperscan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/03/07 07:15:47 Log message: import ports/textproc/hyperscan, ok bentley@ Hyperscan is a high-performance multiple regex matching library. It follows the regular expression syntax of the commonly-used libpcre library, but is a standalone library with its own C API. Hyperscan uses hybrid automata techniques to allow simultaneous matching of large numbers (up to tens of thousands) of regular expressions and for the matching of regular expressions across streams of data. Hyperscan is built for specific CPU microarchitectures - you must choose one: ssse3 (uses -march=core2, for most amd64 and clone CPUs) sse4_2 (uses -march=corei7, requires SSE4_2 and POPCNT) avx2(uses -march=core-avx2, requires AVX2) native (uses -march=native, optimise for local machine) Status: Vendor Tag: sthen Release Tags: sthen_20210307 N ports/textproc/hyperscan/Makefile N ports/textproc/hyperscan/distinfo N ports/textproc/hyperscan/pkg/DESCR N ports/textproc/hyperscan/pkg/PLIST N ports/textproc/hyperscan/patches/patch-examples_patbench_cc N ports/textproc/hyperscan/patches/patch-tools_hscollider_limit_cpp N ports/textproc/hyperscan/patches/patch-examples_pcapscan_cc N ports/textproc/hyperscan/patches/patch-CMakeLists_txt N ports/textproc/hyperscan/patches/patch-tools_hscollider_CMakeLists_txt No conflicts created by this import
mips64 bulk build report
bulk build on octeon.ports.openbsd.org started on Mon Mar 1 16:31:29 UTC 2021 finished at Sat Mar 6 09:28:58 UTC 2021 lasted 05D16h57m done with kern.version=OpenBSD 6.9-beta (GENERIC.MP) #489: Mon Mar 1 03:52:36 MST 2021 built packages:8207 Mar 1:2085 Mar 2:1348 Mar 3:615 Mar 4:774 Mar 5:2917 Mar 6:467 build failures: 35 http://build-failures.rhaalovely.net/mips64/2021-03-01/cad/netgen.log http://build-failures.rhaalovely.net/mips64/2021-03-01/chinese/libchewing.log http://build-failures.rhaalovely.net/mips64/2021-03-01/chinese/libpinyin.log http://build-failures.rhaalovely.net/mips64/2021-03-01/devel/coccinelle.log http://build-failures.rhaalovely.net/mips64/2021-03-01/devel/glog.log http://build-failures.rhaalovely.net/mips64/2021-03-01/devel/libexecinfo.log http://build-failures.rhaalovely.net/mips64/2021-03-01/devel/py-unicorn,python3.log http://build-failures.rhaalovely.net/mips64/2021-03-01/emulators/openmsx.log http://build-failures.rhaalovely.net/mips64/2021-03-01/emulators/pcsxr.log http://build-failures.rhaalovely.net/mips64/2021-03-01/emulators/spike.log http://build-failures.rhaalovely.net/mips64/2021-03-01/games/astromenace.log http://build-failures.rhaalovely.net/mips64/2021-03-01/games/egoboo.log http://build-failures.rhaalovely.net/mips64/2021-03-01/games/f1spirit.log http://build-failures.rhaalovely.net/mips64/2021-03-01/games/hyperrogue.log http://build-failures.rhaalovely.net/mips64/2021-03-01/games/mirrormagic.log http://build-failures.rhaalovely.net/mips64/2021-03-01/geo/gpstk.log http://build-failures.rhaalovely.net/mips64/2021-03-01/inputmethods/scim-fcitx.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/STk.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/gforth.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/librep.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/moarvm.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/pfe.log http://build-failures.rhaalovely.net/mips64/2021-03-01/lang/ruby/3.0.log http://build-failures.rhaalovely.net/mips64/2021-03-01/math/gbc.log http://build-failures.rhaalovely.net/mips64/2021-03-01/math/lrs.log http://build-failures.rhaalovely.net/mips64/2021-03-01/math/ntl.log http://build-failures.rhaalovely.net/mips64/2021-03-01/multimedia/lives.log http://build-failures.rhaalovely.net/mips64/2021-03-01/net/angst.log http://build-failures.rhaalovely.net/mips64/2021-03-01/net/dino.log http://build-failures.rhaalovely.net/mips64/2021-03-01/net/ettercap,no_x11.log http://build-failures.rhaalovely.net/mips64/2021-03-01/net/yersinia.log http://build-failures.rhaalovely.net/mips64/2021-03-01/plan9/drawterm.log http://build-failures.rhaalovely.net/mips64/2021-03-01/security/botan2.log http://build-failures.rhaalovely.net/mips64/2021-03-01/shells/ksh93.log http://build-failures.rhaalovely.net/mips64/2021-03-01/sysutils/u-boot,aarch64.log
[UPDATE] multimedia/mlt
This makes use of the libebur128 port I posted a few hours ago
I've had most of this in my dir for a while, I actually got stumped on
something stupid in shotcut.
I've built and used shotcut with this without issue. I've also built
kdenlive, but I'm not too familiar with it.
Highlights:
- uses external libebur
- fix loads of warnings with clang (these patches haven been sent as
Issue to upstream)
Please test/okay
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile24 Aug 2020 14:09:54 - 1.27
+++ Makefile7 Mar 2021 13:47:08 -
@@ -2,14 +2,14 @@
COMMENT-main = multimedia transformations framework
COMMENT-gpl2 = GPLv2-licensed modules for mlt
-VERSION = 6.22.1
+VERSION = 6.24.0
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
# XXX versions should be kept in sync together
-SHARED_LIBS = mlt 3.2
-SHARED_LIBS += mlt++ 3.2
+SHARED_LIBS = mlt 4.0
+SHARED_LIBS += mlt++ 4.0
CATEGORIES = multimedia devel
HOMEPAGE = https://www.mltframework.org/
@@ -21,12 +21,13 @@ DEBUG_PACKAGES =${BUILD_PACKAGES}
PERMIT_PACKAGE = Yes
WANTLIB-main += ${COMPILER_LIBCXX} SDL SDL2 SDL_image X11 avcodec avdevice
-WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig gdk-x11-2.0
+WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig
WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
WANTLIB-main += pangoft2-1.0 sox swresample swscale vorbisfile xml2
+WANTLIB-main += ebur128
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
-WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
+WANTLIB += Qt5Xml SDL2 m mlt samplerate
MASTER_SITES =
https://github.com/mltframework/mlt/releases/download/v${VERSION}/
@@ -43,13 +44,14 @@ RUN_DEPENDS-main = audio/ladspa \
x11/gtk+3,-guic
LIB_DEPENDS-main = audio/jack \
+ audio/libebur128 \
audio/sox \
devel/sdl-image \
devel/sdl2 \
graphics/ffmpeg \
graphics/libexif \
math/fftw3 \
- x11/gtk+2,-main
+ devel/pango
LIB_DEPENDS-gpl2 = ${BUILD_PKGPATH},-main \
${MODQT5_LIB_DEPENDS} \
Index: distinfo
===
RCS file: /cvs/ports/multimedia/mlt/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo24 Aug 2020 14:09:54 - 1.9
+++ distinfo7 Mar 2021 13:47:08 -
@@ -1,2 +1,2 @@
-SHA256 (mlt-6.22.1.tar.gz) = o9698LiBHw0gyQLMPfPQXa19P/NtHbFsCnM40NWYmZg=
-SIZE (mlt-6.22.1.tar.gz) = 1343746
+SHA256 (mlt-6.24.0.tar.gz) = O5d8VjIyn8p2NNADQWLfbVt5zeMla6xD57qDU6zO1h4=
+SIZE (mlt-6.24.0.tar.gz) = 1351427
Index: patches/patch-src_framework_Makefile
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_framework_Makefile
--- patches/patch-src_framework_Makefile24 Aug 2020 14:09:54 -
1.5
+++ patches/patch-src_framework_Makefile7 Mar 2021 13:47:08 -
@@ -20,7 +20,17 @@ Index: src/framework/Makefile
else
NAME = libmlt$(LIBSUF)
TARGET = $(NAME).$(version)
-@@ -100,10 +102,12 @@ all: $(TARGET)
+@@ -92,18 +94,20 @@ OBJS += ../win32/win32.o ../win32/strptime.o
+ SRCS += ../win32/win32.c ../win32/strptime.c
+ endif
+
+-CFLAGS += $(RDYNAMIC) -DPREFIX_DATA="\"$(mltdatadir)\""
-DPREFIX_LIB="\"$(moduledir)\""
++CFLAGS += -DPREFIX_DATA="\"$(mltdatadir)\"" -DPREFIX_LIB="\"$(moduledir)\""
+
+-LDFLAGS += $(LIBDL) -lpthread -lm
++LDFLAGS += $(RDYNAMIC) $(LIBDL) -lpthread -lm
+
+ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
Index: patches/patch-src_framework_mlt_property_c
===
RCS file: /cvs/ports/multimedia/mlt/patches/patch-src_framework_mlt_property_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_framework_mlt_property_c
--- patches/patch-src_framework_mlt_property_c 24 Aug 2020 14:09:54 -
1.4
+++ patches/patch-src_framework_mlt_property_c 7 Mar 2021 13:47:08 -
@@ -7,22 +7,7 @@ locale functions from dumping core!
Index: src/framework/mlt_property.c
--- src/framework/mlt_property.c.orig
+++ src/framework/mlt_property.c
-@@ -90,8 +90,12 @@ struct mlt_property_s
- mlt_property mlt_property_init( )
- {
- mlt_property self = calloc( 1, sizeof( *self ) );
-- if ( self )
--
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2021/03/07 06:38:21 Modified files: x11/kde-plasma : Makefile Log message: Hook up x11/kde-plasma/oxygen reminded by tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2021/03/07 06:33:21 Modified files: productivity/taskwarrior: Makefile distinfo productivity/taskwarrior/pkg: PLIST Log message: Update taskwarrior to 2.5.3, fixing minor sed issues on the way. okay jasper@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2021/03/07 06:31:48 Log message: Import the Oxygen Style for Qt/KDE Applications. This is not the same as devel/kf5/oxygen-icons. Initial port, some tweaks and okay from rsadowski@ Status: Vendor Tag: zhuk Release Tags: zhuk_20210307 N ports/x11/kde-plasma/oxygen/Makefile N ports/x11/kde-plasma/oxygen/distinfo N ports/x11/kde-plasma/oxygen/pkg/DESCR N ports/x11/kde-plasma/oxygen/pkg/PLIST No conflicts created by this import
NEW PORT (dependency update): libebur128 1.2.6
Stumbled upon this while updating mlt.
It's a library that "implements the ebur R 128 loudness standard"
(whatever that means)
Turns out both multimedia/mlt and audio/cantata bundle that code.
It's a very small library, just one file, but we should move to
the upstream version.
Two reasons:
- bundled version uses queue.h, but depends on its bundled version
instead of detecting and using the system one.
- bundled version uses outdated code. In particular, newer code
has a safe_multiply function that borrows directly from our memory
allocator, and hence avoids integer overflows.
A full grep of the package logs show no other possible users.
ffmpeg, as usual, plays the lone kid and has its own distinct
implementation of the ebur128 standard.
Here are patches to both mlt and cantata to use this, along with
the port itself as an attached tarball
(note: I will also need to check WANTLIB on consumers of cantata
and mlt, but that shouldn't be too hard)
Index: audio/Makefile
===
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.450
diff -u -p -r1.450 Makefile
--- audio/Makefile 20 Feb 2021 20:54:56 - 1.450
+++ audio/Makefile 7 Mar 2021 13:10:06 -
@@ -74,6 +74,7 @@
SUBDIR += libcue
SUBDIR += libdca
SUBDIR += libdiscid
+ SUBDIR += libebur128
SUBDIR += libgpod
SUBDIR += libid3tag
SUBDIR += liblastfm
Index: audio/cantata/Makefile
===
RCS file: /cvs/ports/audio/cantata/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- audio/cantata/Makefile 3 Oct 2020 07:21:50 - 1.23
+++ audio/cantata/Makefile 7 Mar 2021 13:10:06 -
@@ -5,6 +5,7 @@ COMMENT = Qt-based MPD client
V =2.4.2
DISTNAME = cantata-${V}
HOMEPAGE = https://github.com/CDrummond/cantata
+REVISION = 0
MASTER_SITES = https://github.com/CDrummond/cantata/releases/download/v${V}/
EXTRACT_SUFX = .tar.bz2
@@ -27,6 +28,7 @@ RUN_DEPENDS +=x11/gtk+3,-guic
LIB_DEPENDS += audio/mpg123 \
audio/libcdio \
audio/libcdio-paranoia \
+ audio/libebur128 \
audio/libcddb \
audio/libmusicbrainz5 \
audio/taglib \
Index: multimedia/mlt/Makefile
===
RCS file: /cvs/ports/multimedia/mlt/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- multimedia/mlt/Makefile 24 Aug 2020 14:09:54 - 1.27
+++ multimedia/mlt/Makefile 7 Mar 2021 13:10:06 -
@@ -6,6 +6,7 @@ VERSION = 6.22.1
DISTNAME = mlt-${VERSION}
PKGNAME-main = ${DISTNAME}
PKGNAME-gpl2 = mlt-gpl2-${VERSION}
+REVISION = 0
# XXX versions should be kept in sync together
SHARED_LIBS = mlt 3.2
@@ -24,6 +25,7 @@ WANTLIB-main += ${COMPILER_LIBCXX} SDL S
WANTLIB-main += avfilter avformat avutil c exif fftw3 fontconfig gdk-x11-2.0
WANTLIB-main += gdk_pixbuf-2.0 glib-2.0 gobject-2.0 jack m pango-1.0
WANTLIB-main += pangoft2-1.0 sox swresample swscale vorbisfile xml2
+WANTLIB-main += ebur128
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
WANTLIB += Qt5Xml SDL2 exif m mlt samplerate
@@ -43,6 +45,7 @@ RUN_DEPENDS-main =audio/ladspa \
x11/gtk+3,-guic
LIB_DEPENDS-main = audio/jack \
+ audio/libebur128 \
audio/sox \
devel/sdl-image \
devel/sdl2 \
libebur128-1.2.6.tgz
Description: application/tar-gz
childsplay needs py-numpy
Without numpy childsplay fails to start (see cairoimage.py).
OK?
Index: Makefile
===
RCS file: /cvs/ports/games/childsplay/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile23 Feb 2021 19:39:22 - 1.31
+++ Makefile7 Mar 2021 11:41:22 -
@@ -4,7 +4,7 @@ COMMENT=collection of educational activ
DISTNAME= childsplay-2.6.5
EXTRACT_SUFX= .tgz
-REVISION = 3
+REVISION = 4
CATEGORIES=games education
@@ -23,6 +23,7 @@ BUILD_DEPENDS=${_MODPY_BUILD_DEPENDS}
RUN_DEPENDS= databases/py-sqlalchemy \
devel/pygame \
+ math/py-numpy \
x11/py-gtk2
NO_TEST= Yes
Re: oolite: fix -fno-common
Antoine Jacoutot writes: > > I gave it a try, but got stuck at link time. > > > > undefined reference to `__stack_chk_fail'? > > undefined reference to `__errno_location'?? > > undefined reference to `stdin'??? > > Probably due to -no-undefined I think the problem is that it's trying to link against a precompiled Linux libmozjs. Need to figure out how to get it to build that from source. I'm not going to try any more though.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2021/03/07 02:28:36 Modified files: sysutils/rsyslog: Makefile distinfo Log message: Update rsyslog to version 8.2102.0 OK sthen@
Re: oolite: fix -fno-common
On Sun, Mar 07, 2021 at 01:37:19AM -0700, Anthony J. Bentley wrote:
> Christian Weisgerber writes:
> > Martin Vahlensieck:
> >
> > > Rather mechanical fix for -fno-common.
> >
> > This would be a great opportunity to update the port to the latest
> > release 1.90 instead of letting the obsolete version sit there.
>
> I gave it a try, but got stuck at link time.
>
> undefined reference to `__stack_chk_fail'?
> undefined reference to `__errno_location'??
> undefined reference to `stdin'???
Probably due to -no-undefined
> I have no idea.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/oolite/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile 26 Feb 2021 18:20:33 - 1.24
> +++ Makefile 7 Mar 2021 08:31:15 -
> @@ -1,21 +1,20 @@
> -# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
> +# $OpenBSD: Makefile.template,v 1.90 2021/02/25 21:59:27 sthen Exp $
>
> COMMENT= space combat and trading game in the style of Elite
>
> -VERSION= 1.73.4
> -REVISION = 16
> -DISTNAME=oolite-dev-source-${VERSION}
> +VERSION =1.90
> +DISTNAME = oolite-source-${VERSION}
> PKGNAME= oolite-${VERSION}
> CATEGORIES= games
>
> HOMEPAGE=http://www.oolite.org/
>
> -MAINTAINER= Nicholas Marriott
> -
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=oolite-linux.berlios/}
> +FIX_EXTRACT_PERMISSIONS =Yes
> +
> +MASTER_SITES =
> https://github.com/OoliteProject/oolite/releases/download/$V/
> EXTRACT_SUFX=.tar.bz2
>
> MODULES= x11/gnustep
> @@ -27,26 +26,9 @@ LIB_DEPENDS= devel/sdl-mixer \
> WANTLIB += c GL GLU SDL SDL_mixer png
> WANTLIB += ${COMPILER_LIBCXX}
>
> -MAKE_FILE = Makefile
> MAKE_FLAGS = LD="${CC}"
> -ALL_TARGET= release
>
> -FIX_CRLF_FILES = GNUmakefile.postamble \
> - Makefile \
> - src/Core/Debug/OODebugTCPConsoleClient.m \
> - src/Core/Materials/OOPNGTextureLoader.m \
> - src/Core/OOAsyncQueue.m \
> - src/Core/OOCPUInfo.h \
> - src/Core/OOCacheManager.m \
> - src/Core/OOLogHeader.m \
> - src/Core/OOLogOutputHandler.m \
> - src/Core/OOMaths.h \
> - src/Core/OOPriorityQueue.m \
> - src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m \
> - src/Core/OXPVerifier/OOOXPVerifierStage.m \
> - src/Core/OldSchoolPropertyListWriting.m \
> - src/Core/Scripting/OOJSOolite.m \
> - src/SDL/OOSDLSoundMixer.m
> +USE_GMAKE = Yes
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/oolite/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 25 Apr 2013 16:40:44 - 1.2
> +++ distinfo 7 Mar 2021 08:31:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (oolite-dev-source-1.73.4.tar.bz2) =
> na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
> -SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
> +SHA256 (oolite-source-1.90.tar.bz2) =
> dJAjlL5fbbFUQM5M9FSfQAnFDX4zUS+MmhV9lX/ay5E=
> +SIZE (oolite-source-1.90.tar.bz2) = 151686958
> Index: patches/patch-GNUmakefile
> ===
> RCS file: /cvs/ports/games/oolite/patches/patch-GNUmakefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-GNUmakefile
> --- patches/patch-GNUmakefile 4 Jun 2013 15:41:19 - 1.3
> +++ patches/patch-GNUmakefile 7 Mar 2021 08:31:15 -
> @@ -1,17 +1,14 @@
> -$OpenBSD: patch-GNUmakefile,v 1.3 2013/06/04 15:41:19 naddy Exp $
> GNUmakefile.orig Sun Aug 30 13:46:42 2009
> -+++ GNUmakefile Fri Jan 14 11:12:36 2011
> -@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
> - else
> - LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
> - LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
> --ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
> -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting
> -Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier
> -Isrc/Core/Debug
> -+LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
> -+ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
> -I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat
> -Isrc/Core/Scripting -Isrc/Core/Materials -Isrc/Core/Entities
> -Isrc/Core/OXPVerifier -Isrc/Core/Debug
> - ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL
> -lSDL_mixer -lgnustep-base
> - ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
> --ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
> -Wno-import `sdl-config --cflags`
> -+ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/07 01:41:50 Modified files: sysutils/ansible-lint: Makefile distinfo Log message: Update to ansible-lint-5.0.2.
Re: oolite: fix -fno-common
Christian Weisgerber writes:
> Martin Vahlensieck:
>
> > Rather mechanical fix for -fno-common.
>
> This would be a great opportunity to update the port to the latest
> release 1.90 instead of letting the obsolete version sit there.
I gave it a try, but got stuck at link time.
undefined reference to `__stack_chk_fail'?
undefined reference to `__errno_location'??
undefined reference to `stdin'???
I have no idea.
Index: Makefile
===
RCS file: /cvs/ports/games/oolite/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile26 Feb 2021 18:20:33 - 1.24
+++ Makefile7 Mar 2021 08:31:15 -
@@ -1,21 +1,20 @@
-# $OpenBSD: Makefile,v 1.24 2021/02/26 18:20:33 naddy Exp $
+# $OpenBSD: Makefile.template,v 1.90 2021/02/25 21:59:27 sthen Exp $
COMMENT= space combat and trading game in the style of Elite
-VERSION= 1.73.4
-REVISION = 16
-DISTNAME= oolite-dev-source-${VERSION}
+VERSION = 1.90
+DISTNAME = oolite-source-${VERSION}
PKGNAME= oolite-${VERSION}
CATEGORIES=games
HOMEPAGE= http://www.oolite.org/
-MAINTAINER=Nicholas Marriott
-
# GPLv2
PERMIT_PACKAGE=Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oolite-linux.berlios/}
+FIX_EXTRACT_PERMISSIONS = Yes
+
+MASTER_SITES = https://github.com/OoliteProject/oolite/releases/download/$V/
EXTRACT_SUFX= .tar.bz2
MODULES= x11/gnustep
@@ -27,26 +26,9 @@ LIB_DEPENDS= devel/sdl-mixer \
WANTLIB += c GL GLU SDL SDL_mixer png
WANTLIB += ${COMPILER_LIBCXX}
-MAKE_FILE =Makefile
MAKE_FLAGS = LD="${CC}"
-ALL_TARGET=release
-FIX_CRLF_FILES = GNUmakefile.postamble \
- Makefile \
- src/Core/Debug/OODebugTCPConsoleClient.m \
- src/Core/Materials/OOPNGTextureLoader.m \
- src/Core/OOAsyncQueue.m \
- src/Core/OOCPUInfo.h \
- src/Core/OOCacheManager.m \
- src/Core/OOLogHeader.m \
- src/Core/OOLogOutputHandler.m \
- src/Core/OOMaths.h \
- src/Core/OOPriorityQueue.m \
- src/Core/OXPVerifier/OOCheckRequiresPListVerifierStage.m \
- src/Core/OXPVerifier/OOOXPVerifierStage.m \
- src/Core/OldSchoolPropertyListWriting.m \
- src/Core/Scripting/OOJSOolite.m \
- src/SDL/OOSDLSoundMixer.m
+USE_GMAKE =Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/oolite.app/oolite ${PREFIX}/bin
Index: distinfo
===
RCS file: /cvs/ports/games/oolite/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo25 Apr 2013 16:40:44 - 1.2
+++ distinfo7 Mar 2021 08:31:15 -
@@ -1,2 +1,2 @@
-SHA256 (oolite-dev-source-1.73.4.tar.bz2) =
na/9vog5IHJSIvI+wqoQGSa97ygc/mLEE7PP9KEMMAc=
-SIZE (oolite-dev-source-1.73.4.tar.bz2) = 37486680
+SHA256 (oolite-source-1.90.tar.bz2) =
dJAjlL5fbbFUQM5M9FSfQAnFDX4zUS+MmhV9lX/ay5E=
+SIZE (oolite-source-1.90.tar.bz2) = 151686958
Index: patches/patch-GNUmakefile
===
RCS file: /cvs/ports/games/oolite/patches/patch-GNUmakefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-GNUmakefile
--- patches/patch-GNUmakefile 4 Jun 2013 15:41:19 - 1.3
+++ patches/patch-GNUmakefile 7 Mar 2021 08:31:15 -
@@ -1,17 +1,14 @@
-$OpenBSD: patch-GNUmakefile,v 1.3 2013/06/04 15:41:19 naddy Exp $
GNUmakefile.orig Sun Aug 30 13:46:42 2009
-+++ GNUmakefileFri Jan 14 11:12:36 2011
-@@ -20,10 +20,11 @@ ifeq ($(GNUSTEP_HOST_OS),mingw32)
- else
- LIBJS_SRC_DIR = deps/Cross-platform-deps/SpiderMonkey/js/src
- LIBJS_BIN_DIR = $(LIBJS_SRC_DIR)/Linux_All_OPT.OBJ
-- ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting -Isrc/Core/Materials
-Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
-+ LIBJS_XCODE_DIR = deps/Cross-platform-deps/SpiderMonkey/js/xcode
-+ ADDITIONAL_INCLUDE_DIRS = -I$(LIBJS_SRC_DIR) -I$(LIBJS_BIN_DIR)
-I$(LIBJS_XCODE_DIR) -Isrc/SDL -Isrc/Core -Isrc/BSDCompat -Isrc/Core/Scripting
-Isrc/Core/Materials -Isrc/Core/Entities -Isrc/Core/OXPVerifier -Isrc/Core/Debug
- ADDITIONAL_OBJC_LIBS = -lpng $(LIBJS_BIN_DIR)/libjs.a -lGLU -lGL -lSDL
-lSDL_mixer -lgnustep-base
- ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
-- ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import `sdl-config --cflags`
-+ ADDITIONAL_OBJCFLAGS = -std=c99 -DLOADSAVEGUI -DLINUX -DXP_UNIX
-Wno-import -DBUNDLE_PATH='@"$(LOCALBASE)/share/oolite"' `sdl-config --cflags`
- oolite_LIB_DIRS += -L/usr/X11R6/lib/
- endif
- ifeq ($(libespeak),yes)
+$OpenBSD$
+
+Index: GNUmakefile
+--- GNUmakefile.orig
GNUmakefile
+@@ -69,7 +69,7 @@ else
+ endif
+
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/07 01:30:04 Modified files: graphics/gdk-pixbuf2: Makefile graphics/gdk-pixbuf2/pkg: PLIST Log message: Move @unexec-delete after @tag so that /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders is correctly removed at pkg_delete time.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/03/07 01:28:17 Modified files: x11/gtk+4 : Makefile x11/gtk+4/pkg : PLIST-guic Log message: Sync with x11/gtk+3 but as comment since gtk-update-icon-cache is handled by gtk+3 for now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2021/03/07 01:03:48 Modified files: audio/flite: Makefile audio/flite/pkg: MESSAGE Log message: Update url in MESSAGE.
