CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2020/11/16 00:10:29 Modified files: devel/p5-Log-Any: Makefile devel/p5-Log-Any/pkg: PLIST Log message: Update PLSIT, original diff from Wen Heping, reminded by afresh1@
Re: UPDATE: xvidcore 1.3.7
On Mon Nov 16, 2020 at 01:34:23AM -0500, Brad Smith wrote: > The rest of the ports pick up xvid via FFmpeg. > Fine! How do you know that? Is there a trick to finding that out? For me as a person who is not deeply in the multimedia stack, it is difficult to see this.
Re: UPDATE: xvidcore 1.3.7
On Mon Nov 16, 2020 at 01:29:25AM -0500, Brad Smith wrote:
> Looking at WANTLIBs is not direct dependencies. The only two depenencies are
> FFmpeg and transcode. ufoai is broken at the moment.
>
Interesting, how can I find out something like that? It looks clear to me:
./audio/audacity/Makefile:WANTLIB += xcb-shm xml2 xvidcore z zstd
./audio/deadbeef/Makefile:WANTLIB += xvidcore z zip fribidi
./audio/moc/Makefile:WANTLIB += vpx wavpack x264 x265 xvidcore z
./games/ufoai/base/Makefile:WANTLIB-main += xvidcore ${cWANTLIB}
./graphics/ffmpeg/Makefile:WANTLIB+=xcb-xfixes xml2 xvidcore z
./multimedia/handbrake/Makefile:WANTLIB += xcb-shm xml2 xvidcore z
./multimedia/libquicktime/Makefile:WANTLIB += xcb xcb-dri2 xcb-glx xcb-render
xcb-shm xvidcore z
./multimedia/transcode/Makefile:WANTLIB += xvidcore
./multimedia/xine-lib/Makefile:WANTLIB += xvidcore z
./telephony/iaxclient/Makefile:WANTLIB-main += vorbisenc vpx x264 x265
xvidcore
./x11/mplayer/Makefile: swresample util x264 xvidcore z
./x11/vlc/Makefile: xshmfence xvidcore z zstd ${WANTLIB-common}
./x11/wxSVG/Makefile:WANTLIB += xcb-shm xvidcore z
./x11/xfce4/tumbler/Makefile:WANTLIB += vpx x264 x265 xvidcore theoradec
theoraenc zstd
>
> On 11/16/2020 1:27 AM, Rafael Sadowski wrote:
> > On Sun Nov 15, 2020 at 05:19:36PM -0500, Brad Smith wrote:
> > > On 11/15/2020 5:26 AM, Rafael Sadowski wrote:
> > > > On Sun Nov 15, 2020 at 02:08:25AM -0500, Brad Smith wrote:
> > > > > Here is an update to xvidcore 1.3.7.
> > > > I'm happy about this kind of update. The question I ask myself, did you
> > > > build all consumer?
> > > There are only 2 consumers in the tree. Yes.
> > >
> > Weird I count 15 with bad gerp-fu.
> >
> > audio/audacity/
> > audio/deadbeef/
> > audio/moc/
> > games/ufoai/base/
> > graphics/ffmpeg/
> > multimedia/
> > multimedia/handbrake/
> > multimedia/libquicktime/
> > multimedia/transcode/
> > multimedia/xine-lib/
> > telephony/iaxclient/
> > x11/mplayer/
> > x11/vlc/
> > x11/wxSVG/
> > x11/xfce4/tumbler/
>
Re: [PATCH 00/11] first attempt at updating sphinx
Even an update to 1.8.5 which still has Python 2 support would be an improvement for the areas I have run into Sphinx issues. On 11/15/2020 4:12 PM, Stuart Henderson wrote: It either needs the port splitting (py2-sphinx and py-sphinx) or sticking with a Python 2.7-compatible version. Getting the required updates tested and committed world be a good first step (py-six etc).
Re: audio/chromaprint
On Mon Nov 16, 2020 at 01:24:55AM -0500, Brad Smith wrote:
>
> On 11/16/2020 1:22 AM, Rafael Sadowski wrote:
> > On Sun Nov 15, 2020 at 12:54:23PM +0100, Rafael Sadowski wrote:
> > > Simple update diff to the latest version.
> > >
> > Symbols have been removed so bump shared lib. Spotted by cwen@, thanks.
>
> You bumped the comment version not the version that actually matters.
>
I need another coffee. Thanks Brad! Last diff, I am not interested in
this update.
Index: Makefile
===
RCS file: /cvs/ports/audio/chromaprint/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile23 Aug 2019 20:18:04 - 1.13
+++ Makefile16 Nov 2020 06:28:01 -
@@ -4,9 +4,9 @@ COMMENT = audio fingerprint extraction
GH_ACCOUNT = acoustid
GH_PROJECT = chromaprint
-GH_TAGNAME = v1.4.3
+GH_TAGNAME = v1.5.0
-SHARED_LIBS = chromaprint 2.0 # 1.4.3
+SHARED_LIBS = chromaprint 3.0 # 1.5.0
CATEGORIES = audio devel
Index: distinfo
===
RCS file: /cvs/ports/audio/chromaprint/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo23 Aug 2019 20:18:04 - 1.3
+++ distinfo16 Nov 2020 06:28:01 -
@@ -1,2 +1,2 @@
-SHA256 (chromaprint-1.4.3.tar.gz) =
1K5llig6rXoBWlsERQEgVMY0pLkynssjAAzTVLQKKDs=
-SIZE (chromaprint-1.4.3.tar.gz) = 613718
+SHA256 (chromaprint-1.5.0.tar.gz) =
XI4NV5yzR4kAaZEQqpYcFVKkIqGHQc9n3WITaxuHfHs=
+SIZE (chromaprint-1.5.0.tar.gz) = 615221
Index: patches/patch-tests_test_utils_cpp
===
RCS file: patches/patch-tests_test_utils_cpp
diff -N patches/patch-tests_test_utils_cpp
--- patches/patch-tests_test_utils_cpp 23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_cpp,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.cpp
tests/test_utils.cpp.orig
-+++ tests/test_utils.cpp
-@@ -2,6 +2,7 @@
- #include
- #include
- #include "utils.h"
-+#include "test_utils.h"
-
- using namespace chromaprint;
-
-@@ -91,4 +92,12 @@ TEST(Utils, CountSetBits64) {
- EXPECT_EQ(56, CountSetBits(0xFFU));
- EXPECT_EQ(64, CountSetBits(0xU));
- EXPECT_EQ(8, CountSetBits(0x0101010101010101U));
-+}
-+
-+TEST(Utils, LoadAudioFile) {
-+ std::vector data = LoadAudioFile("data/test_mono_44100.raw");
-+ ASSERT_EQ(data.size(), 176400/2);
-+ EXPECT_EQ(data[1000], 0);
-+ EXPECT_EQ(data[2000], 107);
-+ EXPECT_EQ(data[3000], 128);
- }
Index: patches/patch-tests_test_utils_h
===
RCS file: patches/patch-tests_test_utils_h
diff -N patches/patch-tests_test_utils_h
--- patches/patch-tests_test_utils_h23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_h,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.h
tests/test_utils.h.orig
-+++ tests/test_utils.h
-@@ -31,11 +31,15 @@ inline std::vector LoadAudioFile(const std::str
- {
- std::string path = TESTS_DIR + file_name;
- std::ifstream file(path.c_str(), std::ifstream::in |
std::ifstream::binary);
-- file.seekg(0, std::ios::end);
-- int length = file.tellg();
-- file.seekg(0, std::ios::beg);
-- std::vector data(length / 2);
-- file.read((char *)[0], length);
-+ uint8_t buf[4096];
-+ std::vector data;
-+ while (!file.eof()) {
-+ file.read((char *) buf, 4096);
-+ size_t nread = file.gcount();
-+ for (size_t i = 0; i < nread - 1; i += 2) {
-+ data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) |
((uint16_t) buf[i])));
-+ }
-+ }
- file.close();
- return data;
- }
UPDATE archivers/lz4-1.9.3
Diff below updates lz4 to 1.9.3. From the release notes [0]: LZ4 v1.9.3
is a maintenance release, offering more than 200+ commits to fix
multiple corner cases and build scenarios. Update is recommended. liblz4
API is not modified, so it should be a drop-in replacement.
The statement "API is not modified" seems not entirely true as check_sym
did find a new symbol.
Changes to the port:
- Bump minor of SHARED_LIBS
- Update HOMEPAGE
- Take MAINTAINER
- Set DEBUG_PACKAGES=${BUILD_PACKAGES}
- Follow Makefile.template
Testing:
- Build tested consumers
- 'make test' runs successfully
Comments/OK?
[0] https://github.com/lz4/lz4/releases/tag/v1.9.3
Index: Makefile
===
RCS file: /cvs/ports/archivers/lz4/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile3 Feb 2020 20:40:37 - 1.27
+++ Makefile16 Nov 2020 06:10:03 -
@@ -1,38 +1,39 @@
# $OpenBSD: Makefile,v 1.27 2020/02/03 20:40:37 sthen Exp $
-SHARED_LIBS += lz4 3.0
-
COMMENT= fast BSD-licensed data compression
GH_ACCOUNT=lz4
GH_PROJECT=lz4
-GH_TAGNAME=v1.9.2
-REVISION= 0
+GH_TAGNAME=v1.9.3
+
+SHARED_LIBS= lz4 3.1
CATEGORIES=archivers
-HOMEPAGE= https://fastcompression.blogspot.com/p/lz4.html
+HOMEPAGE= https://lz4.github.io/lz4/
+
+MAINTAINER=Bjorn Ketelaars
# library: BSD, tools: GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += c
+WANTLIB= c
-USE_GMAKE= Yes
MAKE_FLAGS=CC="${CC}" \
- CXX="${CXX}" \
- CFLAGS="${CFLAGS}" \
- V=1 \
+ CFLAGS="${CFLAGS} -DLZ4_FORCE_MEMORY_ACCESS=1" \
MANDIR="${PREFIX}/man" \
+ SHARED_EXT_VER="so.${LIBlz4_VERSION}" \
SONAME_FLAGS= \
- SHARED_EXT_VER="so.${LIBlz4_VERSION}"
-FAKE_FLAGS=PREFIX=${PREFIX}
-TEST_ENV+= MAKE_PROGRAM=${MAKE_PROGRAM}
-CFLAGS+= -DLZ4_FORCE_MEMORY_ACCESS=1
-
-post-install:
- mv ${PREFIX}/libdata/pkgconfig/* ${PREFIX}/lib/pkgconfig/
- rmdir ${PREFIX}/libdata/pkgconfig
- rm ${PREFIX}/lib/liblz4.so{.1,}
+ V=1
+FAKE_FLAGS=PKGCONFIGDIR="${PREFIX}/lib/pkgconfig" \
+ PREFIX="${PREFIX}"
+TEST_ENV= MAKE_PROGRAM=${MAKE_PROGRAM}
+
+USE_GMAKE= Yes
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
+
+ALL_TARGET=default
+TEST_TARGET= check
.include
Index: distinfo
===
RCS file: /cvs/ports/archivers/lz4/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo21 Aug 2019 10:55:41 - 1.17
+++ distinfo16 Nov 2020 06:10:03 -
@@ -1,2 +1,2 @@
-SHA256 (lz4-1.9.2.tar.gz) = ZYumGR+kTJIoDUqiwnGw9PvA400klXjdBeUOdtDl78w=
-SIZE (lz4-1.9.2.tar.gz) = 305796
+SHA256 (lz4-1.9.3.tar.gz) = AwZE30YRAH/33JYtmB85A2HmyXo05cvDk9374Bn/4sE=
+SIZE (lz4-1.9.3.tar.gz) = 320958
Index: patches/patch-lib_Makefile
===
RCS file: /cvs/ports/archivers/lz4/patches/patch-lib_Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-lib_Makefile
--- patches/patch-lib_Makefile 21 Aug 2019 10:55:41 - 1.11
+++ patches/patch-lib_Makefile 16 Nov 2020 06:10:03 -
@@ -3,13 +3,12 @@ $OpenBSD: patch-lib_Makefile,v 1.11 2019
Index: lib/Makefile
--- lib/Makefile.orig
+++ lib/Makefile
-@@ -113,9 +113,6 @@ ifeq ($(BUILD_SHARED),yes) # can be disabled on comma
- $(Q)$(CC) $(FLAGS) -DLZ4_DLL_EXPORT=1 -shared $^ -o dll/$@.dll
-Wl,--out-implib,dll/$(LIBLZ4_EXP)
- else
- $(Q)$(CC) $(FLAGS) -shared $^ -fPIC -fvisibility=hidden $(SONAME_FLAGS)
-o $@
-- @echo creating versioned links
-- $(Q)$(LN_SF) $@ liblz4.$(SHARED_EXT_MAJOR)
-- $(Q)$(LN_SF) $@ liblz4.$(SHARED_EXT)
+@@ -187,8 +187,6 @@ install: lib liblz4.pc
+ $(Q)$(INSTALL_PROGRAM) dll/$(LIBLZ4_EXP) $(DESTDIR)$(libdir)
+ else
+ $(Q)$(INSTALL_PROGRAM) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(libdir)
+- $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT_MAJOR)
+- $(Q)$(LN_SF) liblz4.$(SHARED_EXT_VER)
$(DESTDIR)$(libdir)/liblz4.$(SHARED_EXT)
+ endif
endif
- endif
-
+ @echo Installing headers in $(includedir)
Index: patches/patch-tests_test_install_sh
===
RCS file: patches/patch-tests_test_install_sh
diff -N patches/patch-tests_test_install_sh
--- patches/patch-tests_test_install_sh 24 Sep 2018 21:01:34 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tests_test_install_sh,v 1.1 2018/09/24 21:01:34 sthen Exp $
-
-Index: tests/test_install.sh
tests/test_install.sh.orig
-+++ tests/test_install.sh
-@@ -1,7 +1,7 @@
- #/usr/bin/env sh
- set -e
-
--make="make -C $lz4_root"
-+make="${MAKE_PROGRAM:=make} -C $lz4_root"
- for cmd in
Re: UPDATE: xvidcore 1.3.7
On Sun Nov 15, 2020 at 05:19:36PM -0500, Brad Smith wrote: > On 11/15/2020 5:26 AM, Rafael Sadowski wrote: > > On Sun Nov 15, 2020 at 02:08:25AM -0500, Brad Smith wrote: > > > Here is an update to xvidcore 1.3.7. > > I'm happy about this kind of update. The question I ask myself, did you > > build all consumer? > > There are only 2 consumers in the tree. Yes. > Weird I count 15 with bad gerp-fu. audio/audacity/ audio/deadbeef/ audio/moc/ games/ufoai/base/ graphics/ffmpeg/ multimedia/ multimedia/handbrake/ multimedia/libquicktime/ multimedia/transcode/ multimedia/xine-lib/ telephony/iaxclient/ x11/mplayer/ x11/vlc/ x11/wxSVG/ x11/xfce4/tumbler/
Re: audio/chromaprint
On Sun Nov 15, 2020 at 12:54:23PM +0100, Rafael Sadowski wrote:
> Simple update diff to the latest version.
>
Symbols have been removed so bump shared lib. Spotted by cwen@, thanks.
Index: Makefile
===
RCS file: /cvs/ports/audio/chromaprint/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile23 Aug 2019 20:18:04 - 1.13
+++ Makefile16 Nov 2020 06:20:04 -
@@ -4,9 +4,9 @@ COMMENT = audio fingerprint extraction
GH_ACCOUNT = acoustid
GH_PROJECT = chromaprint
-GH_TAGNAME = v1.4.3
+GH_TAGNAME = v1.5.0
-SHARED_LIBS = chromaprint 2.0 # 1.4.3
+SHARED_LIBS = chromaprint 2.0 # 1.5.0
CATEGORIES = audio devel
Index: distinfo
===
RCS file: /cvs/ports/audio/chromaprint/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo23 Aug 2019 20:18:04 - 1.3
+++ distinfo16 Nov 2020 06:20:04 -
@@ -1,2 +1,2 @@
-SHA256 (chromaprint-1.4.3.tar.gz) =
1K5llig6rXoBWlsERQEgVMY0pLkynssjAAzTVLQKKDs=
-SIZE (chromaprint-1.4.3.tar.gz) = 613718
+SHA256 (chromaprint-1.5.0.tar.gz) =
XI4NV5yzR4kAaZEQqpYcFVKkIqGHQc9n3WITaxuHfHs=
+SIZE (chromaprint-1.5.0.tar.gz) = 615221
Index: patches/patch-tests_test_utils_cpp
===
RCS file: patches/patch-tests_test_utils_cpp
diff -N patches/patch-tests_test_utils_cpp
--- patches/patch-tests_test_utils_cpp 23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_cpp,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.cpp
tests/test_utils.cpp.orig
-+++ tests/test_utils.cpp
-@@ -2,6 +2,7 @@
- #include
- #include
- #include "utils.h"
-+#include "test_utils.h"
-
- using namespace chromaprint;
-
-@@ -91,4 +92,12 @@ TEST(Utils, CountSetBits64) {
- EXPECT_EQ(56, CountSetBits(0xFFU));
- EXPECT_EQ(64, CountSetBits(0xU));
- EXPECT_EQ(8, CountSetBits(0x0101010101010101U));
-+}
-+
-+TEST(Utils, LoadAudioFile) {
-+ std::vector data = LoadAudioFile("data/test_mono_44100.raw");
-+ ASSERT_EQ(data.size(), 176400/2);
-+ EXPECT_EQ(data[1000], 0);
-+ EXPECT_EQ(data[2000], 107);
-+ EXPECT_EQ(data[3000], 128);
- }
Index: patches/patch-tests_test_utils_h
===
RCS file: patches/patch-tests_test_utils_h
diff -N patches/patch-tests_test_utils_h
--- patches/patch-tests_test_utils_h23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_h,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.h
tests/test_utils.h.orig
-+++ tests/test_utils.h
-@@ -31,11 +31,15 @@ inline std::vector LoadAudioFile(const std::str
- {
- std::string path = TESTS_DIR + file_name;
- std::ifstream file(path.c_str(), std::ifstream::in |
std::ifstream::binary);
-- file.seekg(0, std::ios::end);
-- int length = file.tellg();
-- file.seekg(0, std::ios::beg);
-- std::vector data(length / 2);
-- file.read((char *)[0], length);
-+ uint8_t buf[4096];
-+ std::vector data;
-+ while (!file.eof()) {
-+ file.read((char *) buf, 4096);
-+ size_t nread = file.gcount();
-+ for (size_t i = 0; i < nread - 1; i += 2) {
-+ data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) |
((uint16_t) buf[i])));
-+ }
-+ }
- file.close();
- return data;
- }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/11/15 22:17:33 Modified files: graphics/piglit: Makefile Added files: graphics/piglit/patches: patch-tests_egl_spec_egl_chromium_sync_control_egl_chromium_sync_control_c patch-tests_util_piglit-framework-gl_c patch-tests_util_piglit-util_c Log message: include libgen.h for basename(3) prompted by -Wimplicit-function-declaration warnings
Re: [macppc] www/webkitgtk4: fix javascript runtime and colors
On Fri, Nov 13, 2020 at 10:33:07PM -0500, Brad Smith wrote:
> On Fri, Nov 13, 2020 at 09:55:01PM -0500, George Koehler wrote:
> > On Wed, 11 Nov 2020 01:38:04 +0100
> > Charlene Wendling wrote:
> >
> > > On Tue, 10 Nov 2020 07:50:26 +0100
> > > Charlene Wendling wrote:
> > >
> > > New diff with aja's and sthen's suggestions. I tested on macppc and, even
> > > if it has no impact there, amd64.
> >
> > I built webkitgtk4 on macppc after you committed your fixes, and with
> > one more change: I deleted the -mlongcall flag. I suggest to keep
> > -mlongcall for now, but the next person to edit webkitgtk4/Makefile
> > should remove -mlongcall at the same time.
> >
> > Below the diff, I explain -mlongcall and -Wl,--relax flags.
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
> > retrieving revision 1.130
> > diff -u -p -r1.130 Makefile
> > --- Makefile11 Nov 2020 21:27:03 - 1.130
> > +++ Makefile13 Nov 2020 20:45:24 -
> > @@ -119,8 +119,6 @@ LDFLAGS += -Wl,--no-keep-memory
> > .if ${MACHINE_ARCH} == "powerpc"
> > # XXX fix colors being off, it would be nice to fix the code
> > CONFIGURE_ARGS += -DENABLE_GRAPHICS_CONTEXT_GL=OFF
> > -CFLAGS += -mlongcall
> > -CXXFLAGS +=-mlongcall
> > LDFLAGS += -Wl,--relax
> > PATCH_LIST = patch-* powerpc-patch-*
> > .endif
> >
> > In powerpc and powerpc64 code, the "bl" instruction for a direct
> > function call uses a signed 26-bit offset. This limits the branch
> > distance to plus or minus 32 megabytes. This works well when each
> > program or shared lib has less than 32M of code.
> >
> > libwebkit2gtk-4.0.so.3.3 is too big, because its LOAD segment with
> > the E flag (for code) has size > 32M = 0x2_000_000 bytes:
> >
> > $ readelf -l libwebkit2gtk-4.0.so.3.3|head
> > ...
> > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> > LOAD 0x00 0x 0x 0x2e979e4 0x2e979e4 R E
> > 0x1
> >
> > With cc -mlongcall, each function call is indirect through a function
> > pointer. This would get around the 32M limit, but it doesn't work
> > because /usr/lib/crt*.o don't use -mlongcall. My test program with
> > code over 32M got linker errors from crtbegin.o and crt0.o.
> >
> > With cc -Wl,--relax, the linker ld.bfd can pass the 32M limit by
> > inserting a thunk (or branch island) between the "bl" and its
> > destination. This doesn't need -mlongcall and does work with crt*.o.
> > We use -Wl,--relax without -mlongcall in devel/llvm on powerpc.
> >
> > cc -Wl,--relax causes an error with ld.lld on powerpc64 (or with
> > cc -fuse-ld=lld on powerpc), but lld inserts thunks (branch islands)
> > by default. If macppc switches to lld, we would remove -Wl,--relax
> > from ports.--George
I also had something like the following..
Index: devel/llvm/Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.267
diff -u -p -u -p -r1.267 Makefile
--- devel/llvm/Makefile 10 Nov 2020 12:05:50 - 1.267
+++ devel/llvm/Makefile 15 Nov 2020 02:33:01 -
@@ -116,9 +114,11 @@ CXXFLAGS+= -mno-retpoline
CXXFLAGS+= -fomit-frame-pointer
.endif
-.if ${MACHINE_ARCH} == "powerpc"
-CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="-Wl,-relax"
-CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-relax"
+# --relax not supported by lld. Can be removed once powerpc switches to lld.
+.include
+.if ${MACHINE_ARCH} == "powerpc" && !${PROPERTIES:Mlld}
+CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLAGS="-Wl,--relax"
+CONFIGURE_ARGS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--relax"
.endif
TEST_TARGET = check check-clang
Index: games/godot/Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- games/godot/Makefile15 Nov 2020 22:05:10 - 1.17
+++ games/godot/Makefile15 Nov 2020 22:22:21 -
@@ -78,7 +78,9 @@ WANTLIB += atomic
.endif
# Fix relocation overflows
-.if ${MACHINE_ARCH:Mpowerpc}
+# --relax not supported by lld. Can be removed once powerpc switches to lld.
+.include
+.if ${MACHINE_ARCH} == "powerpc" && !${PROPERTIES:Mlld}
LDFLAGS += -Wl,--relax
.endif
Index: www/webkitgtk4/Makefile
===
RCS file: /home/cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.131
diff -u -p -u -p -r1.131 Makefile
--- www/webkitgtk4/Makefile 15 Nov 2020 22:05:10 - 1.131
+++ www/webkitgtk4/Makefile 15 Nov 2020 22:47:02 -
@@ -119,8 +119,12 @@ LDFLAGS += -Wl,--no-keep-memory
.if ${MACHINE_ARCH} == "powerpc"
# XXX fix colors being off, it would be nice to fix the code
Re: [update] net/znc 1.7.5 -> 1.8.2 + new maintainer
On 11/15/20 7:20 PM, Aisha Tammy wrote:
> On 11/15/20 2:40 PM, Stuart Henderson wrote:
>> On 2020/11/15 13:20, Aisha Tammy wrote:
>>> On 11/14/20 1:23 PM, Aisha Tammy wrote:
Hi,
Attached update for ZNC.
Also adds ICU unicode support and new LIB_DEPENDS on icu4c.
Aisha
>>> Brad is busy and has kindly asked me to take the port.
>>>
>>> Attached with updated maintainer
>> This diff doesn't apply, something has gone wrong with the linebreaks.
>>
> Apologies.
>
> Theo graciously pointed out an obscure setting from some long forgotten
> page (http://kb.mozillazine.org/Mail_content_types#Disabling_paragraph_flow)
> which fixed some line breaking bad behaviour.
>
> Reattached,
> Aisha
>
> diff --git a/net/znc/Makefile b/net/znc/Makefile
>
> index 8b50172b0fc..9e372675e66 100644
>
> --- a/net/znc/Makefile
>
Oh for fucks sake, that was supposed to have fixed
Probably need to sacrifice some goats or something
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 8b50172b0fc..9e372675e66 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -2,18 +2,20 @@
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.7.5
+DISTNAME= znc-1.8.2
CATEGORIES=net
MASTER_SITES= ${HOMEPAGE}releases/
HOMEPAGE= https://znc.in/
-MAINTAINER=Brad Smith
+MAINTAINER=Aisha Tammy
# Apache 2.0
PERMIT_PACKAGE=Yes
-WANTLIB= c crypto m pthread ssl z ${COMPILER_LIBCXX}
+WANTLIB= c crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX}
+
+LIB_DEPENDS= textproc/icu4c
MODULES= devel/cmake
@@ -21,7 +23,7 @@ COMPILER= base-clang ports-gcc
CONFIGURE_ARGS+= -DWANT_CYRUS=NO \
-DWANT_I18N=NO \
- -DWANT_ICU=NO
+ -DWANT_ICU=YES
NO_TEST= Yes
diff --git a/net/znc/distinfo b/net/znc/distinfo
index 680a1eedded..833699626bc 100644
--- a/net/znc/distinfo
+++ b/net/znc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (znc-1.7.5.tar.gz) = qJQeE4XIZUKHpEKAGNk0WUgunV7u34a+97Ag3cXyRyE=
-SIZE (znc-1.7.5.tar.gz) = 2170656
+SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0=
+SIZE (znc-1.8.2.tar.gz) = 2101215
diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST
index 92aede49ffd..a0d0011af30 100644
--- a/net/znc/pkg/PLIST
+++ b/net/znc/pkg/PLIST
@@ -76,9 +76,7 @@ lib/znc/
@so lib/znc/nickserv.so
@so lib/znc/notes.so
@so lib/znc/notify_connect.so
-@so lib/znc/partyline.so
@so lib/znc/perform.so
-@so lib/znc/q.so
@so lib/znc/raw.so
@so lib/znc/route_replies.so
@so lib/znc/sample.so
@@ -168,6 +166,7 @@ share/znc/translations/fr-FR
share/znc/translations/id-ID
share/znc/translations/it-IT
share/znc/translations/nl-NL
+share/znc/translations/pl-PL
share/znc/translations/ru-RU
share/znc/webskins/
share/znc/webskins/_default_/
Re: UPDATE: xvidcore 1.3.7
On 11/15/2020 5:26 AM, Rafael Sadowski wrote:
On Sun Nov 15, 2020 at 02:08:25AM -0500, Brad Smith wrote:
Here is an update to xvidcore 1.3.7.
I'm happy about this kind of update. The question I ask myself, did you
build all consumer?
There are only 2 consumers in the tree. Yes.
Changes since 1.3.6:
Fix for a regression in initializing the Inter matrix with MPEG Quantization
Changes since 1.3.5:
Fix for various, long-standing and potentially critical security
vulnerabilities in the decoder (credit to OSS-Fuzz)
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xvidcore/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile19 Aug 2019 06:04:23 - 1.23
+++ Makefile15 Nov 2020 06:32:43 -
@@ -2,13 +2,12 @@
COMMENT= ISO MPEG-4 compliant video codec
-DISTNAME= xvidcore-1.3.5
-REVISION= 0
+DISTNAME= xvidcore-1.3.7
CATEGORIES= multimedia
MASTER_SITES= https://downloads.xvid.com/downloads/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= xvidcore 4.4
+SHARED_LIBS= xvidcore5.0
HOMEPAGE= https://www.xvid.com/
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/xvidcore/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo2 Jun 2019 08:31:02 - 1.12
+++ distinfo15 Nov 2020 06:30:49 -
@@ -1,2 +1,2 @@
-SHA256 (xvidcore-1.3.5.tar.bz2) = fCDyefnY6JBC6FRl0ryxsxMM6x7Owz1USMRYnXjwELQ=
-SIZE (xvidcore-1.3.5.tar.bz2) = 698846
+SHA256 (xvidcore-1.3.7.tar.bz2) = ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=
+SIZE (xvidcore-1.3.7.tar.bz2) = 698615
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/multimedia/xvidcore/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 19 Sep 2014 01:44:47 - 1.4
+++ pkg/PLIST 15 Nov 2020 06:35:55 -
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2014/09/19 01:44:47 brad Exp $
include/xvid.h
-lib/libxvidcore.a
+@static-lib lib/libxvidcore.a
@lib lib/libxvidcore.so.${LIBxvidcore_VERSION}
Re: [PATCH 00/11] first attempt at updating sphinx
It would be nice if someone more familiar with Python looked at this
Sphinx update. It's long overdue.
But one thing I noticed looking at part 11/11 of the py-sphinx update
this addition..
+RUN_DEPENDS = ${BUILD_DEPENDS}
You flipped things around with RUN_DEPENDS and BUILD_DEPENDS. Don't do that.
It's too easy to get that one wrong and pull in unwanted dependencies as
a run time
dependency.
On 9/13/2020 9:58 AM, Aisha Tammy wrote:
Bump.
I know theres a lot of changes to do and things to take care off
and this is only the start, but can anyone tell me what I need to
improve on only this part?
I'll start doing recursive updates on deps and rdeps after this
part looks fine.
Aisha
On 9/7/20 8:42 PM, Aisha Tammy wrote:
I'm following this email with multiple patches for
updating sphinx to the latest version 3.2.1 and attaching
its new dependencies.
My apologies if this is not a good method to send patches
but this does make the work a lot cleaner imo.
There are a lot of things still left to do that I am not quite
an expert at but this should at least get the ball rolling
in the correct direction. I would love to get feedback from
everyone and get this working sometime soon.
I am still struggling with getting tests to run for
sphinx from inside the Makefile.
I also haven't done any reverse dependency tests yet given
that I don't know if this is even a worthwhile attempt.
Cheers,
Aisha
Aisha Tammy (11):
[update] sphinx_rtd_theme to 0.4.3
[update] py-six to 1.15.0
[update] py-snowballstemmer to 2.0.0
[new] py-sphinxcontrib-applehelp
[new] py-sphinxcontrib-devhelp
[new] py-sphinxcontrib-htmlhelp
[new] py-sphinxcontrib-jsmath
[new] py-sphinxcontrib-qthelp
[new] py-sphinxcontrib-serializinghtml
[new] py-sphinxcontrib-websupport
[update] py-sphinx to 3.2.1
devel/py-six/Makefile | 3 +-
devel/py-six/distinfo | 4 +-
textproc/py-snowballstemmer/Makefile | 5 +-
textproc/py-snowballstemmer/distinfo | 4 +-
textproc/py-snowballstemmer/pkg/PLIST | 26 +-
textproc/py-sphinx/Makefile | 64 +-
textproc/py-sphinx/distinfo | 4 +-
.../patch-doc_internals_release-process_rst | 18 +
textproc/py-sphinx/pkg/PLIST | 770 --
textproc/py-sphinx_rtd_theme/Makefile | 5 +-
textproc/py-sphinx_rtd_theme/distinfo | 4 +-
textproc/py-sphinx_rtd_theme/pkg/PLIST| 36 +-
textproc/py-sphinxcontrib-applehelp/Makefile | 30 +
textproc/py-sphinxcontrib-applehelp/distinfo | 2 +
textproc/py-sphinxcontrib-applehelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-applehelp/pkg/PLIST | 223 +
textproc/py-sphinxcontrib-devhelp/Makefile| 30 +
textproc/py-sphinxcontrib-devhelp/distinfo| 2 +
textproc/py-sphinxcontrib-devhelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-devhelp/pkg/PLIST | 213 +
textproc/py-sphinxcontrib-htmlhelp/Makefile | 31 +
textproc/py-sphinxcontrib-htmlhelp/distinfo | 2 +
textproc/py-sphinxcontrib-htmlhelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-htmlhelp/pkg/PLIST | 229 ++
textproc/py-sphinxcontrib-jsmath/Makefile | 30 +
textproc/py-sphinxcontrib-jsmath/distinfo | 2 +
textproc/py-sphinxcontrib-jsmath/pkg/DESCR| 2 +
textproc/py-sphinxcontrib-jsmath/pkg/PLIST| 17 +
textproc/py-sphinxcontrib-qthelp/Makefile | 30 +
textproc/py-sphinxcontrib-qthelp/distinfo | 2 +
textproc/py-sphinxcontrib-qthelp/pkg/DESCR| 1 +
textproc/py-sphinxcontrib-qthelp/pkg/PLIST| 216 +
.../py-sphinxcontrib-serializinghtml/Makefile | 30 +
.../py-sphinxcontrib-serializinghtml/distinfo | 2 +
.../pkg/DESCR | 1 +
.../pkg/PLIST | 227 ++
textproc/py-sphinxcontrib-websupport/Makefile | 30 +
textproc/py-sphinxcontrib-websupport/distinfo | 2 +
.../py-sphinxcontrib-websupport/pkg/DESCR | 2 +
.../py-sphinxcontrib-websupport/pkg/PLIST | 60 ++
40 files changed, 2080 insertions(+), 282 deletions(-)
create mode 100644
textproc/py-sphinx/patches/patch-doc_internals_release-process_rst
create mode 100644 textproc/py-sphinxcontrib-applehelp/Makefile
create mode 100644 textproc/py-sphinxcontrib-applehelp/distinfo
create mode 100644 textproc/py-sphinxcontrib-applehelp/pkg/DESCR
create mode 100644 textproc/py-sphinxcontrib-applehelp/pkg/PLIST
create mode 100644 textproc/py-sphinxcontrib-devhelp/Makefile
create mode 100644 textproc/py-sphinxcontrib-devhelp/distinfo
create mode 100644 textproc/py-sphinxcontrib-devhelp/pkg/DESCR
create mode 100644 textproc/py-sphinxcontrib-devhelp/pkg/PLIST
create mode 100644 textproc/py-sphinxcontrib-htmlhelp/Makefile
create mode 100644 textproc/py-sphinxcontrib-htmlhelp/distinfo
create mode 100644 textproc/py-sphinxcontrib-htmlhelp/pkg/DESCR
create
Re: [update] net/znc 1.7.5 -> 1.8.2 + new maintainer
On 11/15/20 2:40 PM, Stuart Henderson wrote:
> On 2020/11/15 13:20, Aisha Tammy wrote:
>> On 11/14/20 1:23 PM, Aisha Tammy wrote:
>>> Hi,
>>> Attached update for ZNC.
>>> Also adds ICU unicode support and new LIB_DEPENDS on icu4c.
>>>
>>> Aisha
>>
>> Brad is busy and has kindly asked me to take the port.
>>
>> Attached with updated maintainer
>
> This diff doesn't apply, something has gone wrong with the linebreaks.
>
Apologies.
Theo graciously pointed out an obscure setting from some long forgotten
page (http://kb.mozillazine.org/Mail_content_types#Disabling_paragraph_flow)
which fixed some line breaking bad behaviour.
Reattached,
Aisha
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 8b50172b0fc..9e372675e66 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -2,18 +2,20 @@
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.7.5
+DISTNAME= znc-1.8.2
CATEGORIES=net
MASTER_SITES= ${HOMEPAGE}releases/
HOMEPAGE= https://znc.in/
-MAINTAINER=Brad Smith
+MAINTAINER=Aisha Tammy
# Apache 2.0
PERMIT_PACKAGE=Yes
-WANTLIB= c crypto m pthread ssl z ${COMPILER_LIBCXX}
+WANTLIB= c crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX}
+
+LIB_DEPENDS= textproc/icu4c
MODULES= devel/cmake
@@ -21,7 +23,7 @@ COMPILER= base-clang ports-gcc
CONFIGURE_ARGS+= -DWANT_CYRUS=NO \
-DWANT_I18N=NO \
- -DWANT_ICU=NO
+ -DWANT_ICU=YES
NO_TEST= Yes
diff --git a/net/znc/distinfo b/net/znc/distinfo
index 680a1eedded..833699626bc 100644
--- a/net/znc/distinfo
+++ b/net/znc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (znc-1.7.5.tar.gz) = qJQeE4XIZUKHpEKAGNk0WUgunV7u34a+97Ag3cXyRyE=
-SIZE (znc-1.7.5.tar.gz) = 2170656
+SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0=
+SIZE (znc-1.8.2.tar.gz) = 2101215
diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST
index 92aede49ffd..a0d0011af30 100644
--- a/net/znc/pkg/PLIST
+++ b/net/znc/pkg/PLIST
@@ -76,9 +76,7 @@ lib/znc/
@so lib/znc/nickserv.so
@so lib/znc/notes.so
@so lib/znc/notify_connect.so
-@so lib/znc/partyline.so
@so lib/znc/perform.so
-@so lib/znc/q.so
@so lib/znc/raw.so
@so lib/znc/route_replies.so
@so lib/znc/sample.so
@@ -168,6 +166,7 @@ share/znc/translations/fr-FR
share/znc/translations/id-ID
share/znc/translations/it-IT
share/znc/translations/nl-NL
+share/znc/translations/pl-PL
share/znc/translations/ru-RU
share/znc/webskins/
share/znc/webskins/_default_/
Re: [update] net/znc 1.7.5 -> 1.8.2 + new maintainer
On 11/15/2020 1:20 PM, Aisha Tammy wrote:
On 11/14/20 1:23 PM, Aisha Tammy wrote:
Hi,
Attached update for ZNC.
Also adds ICU unicode support and new LIB_DEPENDS on icu4c.
Aisha
Brad is busy and has kindly asked me to take the port.
Attached with updated maintainer
I just meant I don't use ZNC anymore so you're welcome to take it.
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 8b50172b0fc..9e372675e66 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -2,18 +2,20 @@
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.7.5
+DISTNAME= znc-1.8.2
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}releases/
HOMEPAGE= https://znc.in/
-MAINTAINER= Brad Smith
+MAINTAINER= Aisha Tammy
# Apache 2.0
PERMIT_PACKAGE= Yes
-WANTLIB= c crypto m pthread ssl z ${COMPILER_LIBCXX}
+WANTLIB= c crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX}
+
+LIB_DEPENDS= textproc/icu4c
MODULES= devel/cmake
@@ -21,7 +23,7 @@ COMPILER= base-clang ports-gcc
CONFIGURE_ARGS+= -DWANT_CYRUS=NO \
-DWANT_I18N=NO \
- -DWANT_ICU=NO
+ -DWANT_ICU=YES
NO_TEST= Yes
diff --git a/net/znc/distinfo b/net/znc/distinfo
index 680a1eedded..833699626bc 100644
--- a/net/znc/distinfo
+++ b/net/znc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (znc-1.7.5.tar.gz) = qJQeE4XIZUKHpEKAGNk0WUgunV7u34a+97Ag3cXyRyE=
-SIZE (znc-1.7.5.tar.gz) = 2170656
+SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0=
+SIZE (znc-1.8.2.tar.gz) = 2101215
diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST
index 92aede49ffd..a0d0011af30 100644
--- a/net/znc/pkg/PLIST
+++ b/net/znc/pkg/PLIST
@@ -76,9 +76,7 @@ lib/znc/
@so lib/znc/nickserv.so
@so lib/znc/notes.so
@so lib/znc/notify_connect.so
-@so lib/znc/partyline.so
@so lib/znc/perform.so
-@so lib/znc/q.so
@so lib/znc/raw.so
@so lib/znc/route_replies.so
@so lib/znc/sample.so
@@ -168,6 +166,7 @@ share/znc/translations/fr-FR
share/znc/translations/id-ID
share/znc/translations/it-IT
share/znc/translations/nl-NL
+share/znc/translations/pl-PL
share/znc/translations/ru-RU
share/znc/webskins/
share/znc/webskins/_default_/
Re: upcoming textproc/groff-1.23.0
Hi Christian, thanks for the feedback! I really appreaciate that. I will look at making a leaner version of the port avoiding the TeXLive dependency. I'll explore the options and come back to you. It's not yet urgent because the release has not yet arrived, but it's very good that i already got your guidance. See below for a few details. Yours, Ingo Christian Weisgerber wrote on Sun, Nov 15, 2020 at 11:17:07PM +0100: > Ingo Schwarze: >> There is another reason why now is a good time to switch priorities. >> Upstream has been doing lots of work on documentation, and in that >> context, they decided to use newer makeinfo(1) features that our >> ancient /usr/bin/makeinfo does not support. The natural consequence >> is to make groff depend on the print/texinfo port and use the newer >> gmakeinfo(1) version contained in that port to format the groff >> documentation. (Yes, the irony that groff does *not* use roff for >> its own documentation but instead uses TeX is not lost on me.) > It is GNU project policy that distribution tarballs include > pre-formatted .info files so that makeinfo is NOT required. tar -tzvf groff-1.23.0.rc1.tar.gz | grep -F .info tells me the groff project doesn't include it in the tarball, but maybe i can convince them to do that in the future. > ... Although, I guess that groff wants to build HTML/PDF documentation? Yes, groff wants to do that, but i wouldn't consider that important. There is not much point in installing HTML and PDF files when the same information is also available in man(1) or info(1) form. > The need for a newer makeinfo will bite us more and more, especially > porters who are not as comfortable disentangling the dependencies > and touch(1)ing the correct files when upstream make a mistake while > creating the tarball and the autotools build cascade goes off and > wants to re-run makeinfo without need... >> Now, print/texinfo isn't exactly a lean port. Here is its >> list of dependencies according to "make full-all-depends": > Installing this monster for a newer makeinfo(1) will sooner or later > trap us in a recursive dependency. I did check that, right now, there is no recursive dependency. But i missed that fact that it sets a trap, so i'll work on a way to update to 1.23.0 without setting that trap. >> * Texinfo is needed to build the documentation. The alternative >>would be to ship groff without documentation and point people to >>https://www.gnu.org/software/groff/manual/html_node/ . >>But frankly, we don't generally like telling people "get the >>manual from the web" in OpenBSD. > Actually, we tend not to build documentation that requires pulling > in dependencies like Doxygen or, well, TeXLive. Duly noted. > (Admittedly, much Doxygen-generated documentation seems very poor > in the first place and just regurgitates header files.) Indeed, Doxygen is mostly useless.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2020/11/15 16:17:00 Modified files: sysutils/ggrep : Makefile distinfo Log message: Update to 3.6. The GREP_OPTIONS environment variable is ignored now.
Re: make clean=depends to clean also test-deps
On Sun, Nov 15, 2020 at 01:19:47AM +0100, Marc Espie wrote: > On Sat, Nov 14, 2020 at 07:36:31PM +, Mikolaj Kucharski wrote: > > Hi, > > > > Before I dig into this, would it be okay, if make clean=depends also > > cleaned up test dependencies? I often use clean-depends to clean up all > > dependencies, but that leaves behind ports in test dependencies. > > > > Would it be okay to include test deps during make clean-depends? > > That would be okay but this will be complicated. Okay. > Specifically, because test-depends are somewhat outside of the normal > depends, and clean=depends uses all-dir-depends, which does not have > test-depends. Okay. > and all-dir-depends shouldn't get test depends because of the way it's > generally used. I don't know. Would need to dig into this. > So this means more variables and more targets... > > The other issue is: what semantics. > make clean=depends will clean build/run depends recursively Yes, it does clean recursively. > if you include test-depends, you might clean up a lot of things... > specifically because test-depends are *outside* the normal build. This is *exactlty* what I want. I want it to clean it all, recursively. > So, what recursive semantics do you want for test depends ?... probably none ? I don't understand this question. -- Regards, Mikolaj
Re: [update] net/znc 1.7.5 -> 1.8.2 + new maintainer
On 11/14/20 1:23 PM, Aisha Tammy wrote:
Hi,
Attached update for ZNC.
Also adds ICU unicode support and new LIB_DEPENDS on icu4c.
Aisha
Brad is busy and has kindly asked me to take the port.
Attached with updated maintainer
diff --git a/net/znc/Makefile b/net/znc/Makefile
index 8b50172b0fc..9e372675e66 100644
--- a/net/znc/Makefile
+++ b/net/znc/Makefile
@@ -2,18 +2,20 @@
COMMENT= advanced IRC bouncer
-DISTNAME= znc-1.7.5
+DISTNAME= znc-1.8.2
CATEGORIES=net
MASTER_SITES= ${HOMEPAGE}releases/
HOMEPAGE= https://znc.in/
-MAINTAINER= Brad Smith
+MAINTAINER=Aisha Tammy
# Apache 2.0
PERMIT_PACKAGE=Yes
-WANTLIB= c crypto m pthread ssl z ${COMPILER_LIBCXX}
+WANTLIB= c crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX}
+
+LIB_DEPENDS= textproc/icu4c
MODULES= devel/cmake
@@ -21,7 +23,7 @@ COMPILER= base-clang ports-gcc
CONFIGURE_ARGS+= -DWANT_CYRUS=NO \
-DWANT_I18N=NO \
- -DWANT_ICU=NO
+ -DWANT_ICU=YES
NO_TEST= Yes
diff --git a/net/znc/distinfo b/net/znc/distinfo
index 680a1eedded..833699626bc 100644
--- a/net/znc/distinfo
+++ b/net/znc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (znc-1.7.5.tar.gz) = qJQeE4XIZUKHpEKAGNk0WUgunV7u34a+97Ag3cXyRyE=
-SIZE (znc-1.7.5.tar.gz) = 2170656
+SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0=
+SIZE (znc-1.8.2.tar.gz) = 2101215
diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST
index 92aede49ffd..a0d0011af30 100644
--- a/net/znc/pkg/PLIST
+++ b/net/znc/pkg/PLIST
@@ -76,9 +76,7 @@ lib/znc/
@so lib/znc/nickserv.so
@so lib/znc/notes.so
@so lib/znc/notify_connect.so
-@so lib/znc/partyline.so
@so lib/znc/perform.so
-@so lib/znc/q.so
@so lib/znc/raw.so
@so lib/znc/route_replies.so
@so lib/znc/sample.so
@@ -168,6 +166,7 @@ share/znc/translations/fr-FR
share/znc/translations/id-ID
share/znc/translations/it-IT
share/znc/translations/nl-NL
+share/znc/translations/pl-PL
share/znc/translations/ru-RU
share/znc/webskins/
share/znc/webskins/_default_/
Re: upcoming textproc/groff-1.23.0
Ingo Schwarze: > There is another reason why now is a good time to switch priorities. > Upstream has been doing lots of work on documentation, and in that > context, they decided to use newer makeinfo(1) features that our > ancient /usr/bin/makeinfo does not support. The natural consequence > is to make groff depend on the print/texinfo port and use the newer > gmakeinfo(1) version contained in that port to format the groff > documentation. (Yes, the irony that groff does *not* use roff for > its own documentation but instead uses TeX is not lost on me.) It is GNU project policy that distribution tarballs include pre-formatted .info files so that makeinfo is NOT required. ... Although, I guess that groff wants to build HTML/PDF documentation? The need for a newer makeinfo will bite us more and more, especially porters who are not as comfortable disentangling the dependencies and touch(1)ing the correct files when upstream make a mistake while creating the tarball and the autotools build cascade goes off and wants to re-run makeinfo without need... > Now, print/texinfo isn't exactly a lean port. Here is its > list of dependencies according to "make full-all-depends": Installing this monster for a newer makeinfo(1) will sooner or later trap us in a recursive dependency. > * Texinfo is needed to build the documentation. The alternative >would be to ship groff without documentation and point people to >https://www.gnu.org/software/groff/manual/html_node/ . >But frankly, we don't generally like telling people "get the >manual from the web" in OpenBSD. Actually, we tend not to build documentation that requires pulling in dependencies like Doxygen or, well, TeXLive. (Admittedly, much Doxygen-generated documentation seems very poor in the first place and just regurgitates header files.) -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gkoeh...@cvs.openbsd.org2020/11/15 15:05:10 Modified files: games/godot: Makefile www/webkitgtk4 : Makefile Log message: Remove last uses of -mlongcall on powerpc -Wl,--relax solves linker errors of "relocation truncated to fit", -mlongcall isn't necessary. diff from Brad Smith, ok cwen@
Re: make clean=depends to clean also test-deps
Marc Espie: > On Sat, Nov 14, 2020 at 07:36:31PM +, Mikolaj Kucharski wrote: > > Before I dig into this, would it be okay, if make clean=depends also > > cleaned up test dependencies? Yes, please! > The other issue is: what semantics. > make clean=depends will clean build/run depends recursively I would expect the same for test depends. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: net/toot got broken recently
On Sun, 15 Nov 2020 13:52:48 + Stuart Henderson : > On 2020/11/15 14:40, Solene Rapenne wrote: > > net/toot got broken recently. I updated my packages 1 or 2 days > > ago, it worked. I updated today and it's now broken. > > Pretty much everything python doing HTTP requests got broken by the > untested py-urllib3 update that got committed recently. > > Update py-requests to unbreak. > it worked with the update, thank you. In case someone will need this later, I needed the python3 flavor which isn't the default flavor.
Re: [UPDATE] math/lrs -> 071a
Hi, Thanks for looking at this. On Sun, Nov 15, 2020 at 05:38:53PM -, Dimitri Karamazov wrote: > Any comments/OK's? This looks good to me. I'm a little confused as to why `make update` doesn't work, but `make install` does an update: ``` $ make update $ make install ===> lrs-071a depends on: gmp-* -> gmp-6.2.0 ===> lrs-071a depends on: gmake-* -> gmake-4.3 ===> Verifying specs: c gmp ===> found c.96.0 gmp.11.0 ===> Installing lrs-071a from /usr/ports/packages/amd64/all/ lrs-042p1->071a: ok ``` Reading packages-specs(7), it seems the `a` suffix should be ok here. Perhaps another porter can chime in. Is that normal? P.S. Dimitri, if you care about lrs, do you want to take MAINTAINER? I don't use this any more. -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
[UPDATE] math/lrs -> 071a
I made a port for lrslib didn't know it already existed under a different guise.
Let me know if I'm missing something in here.
Your tests are successful
Update lrs 042 to 071a
Version 7.1 is a major revision completing the move to an all C library begun
in 7.0 which was work in progress and has been removed from distribution.
Major changes to lrs:
1. redund function is now performed by lrs via options, but legacy redund
maintained
2. extract option to extract columns from the input especially with linearities
3. hvref makes a cross reference list between H and V representations
Major changes to mplrs:
1. Temporary files no longer used for communicating with workers.
2. Parallel version of redund is now available
Any comments/OK's?
Index: Makefile
===
RCS file: /cvs/ports/math/lrs/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:47:42 - 1.6
+++ Makefile15 Nov 2020 17:31:45 -
@@ -2,11 +2,13 @@
COMMENT = solve vertex enumeration and convex hull problems
-DISTNAME = lrslib-042c
-PKGNAME = lrs-042
-REVISION = 1
+V =071a
+DISTNAME = lrslib-${V}
+PKGNAME = lrs-${V}
FIX_EXTRACT_PERMISSIONS=Yes
+SHARED_LIBS = lrs 0.0 # 0.0
+
CATEGORIES = math
HOMEPAGE = http://cgm.cs.mcgill.ca/~avis/C/lrs.html
@@ -18,20 +20,18 @@ PERMIT_PACKAGE =Yes
WANTLIB = c gmp
-MASTER_SITES = http://cgm.cs.mcgill.ca/~avis/C/lrslib/
+MASTER_SITES = http://cgm.cs.mcgill.ca/~avis/C/lrslib/archive/
+
+USE_GMAKE =Yes
MAKE_FILE =makefile
-MAKE_FLAGS = CPPFLAGS=-I${LOCALBASE}/include
LDFLAGS=-L${LOCALBASE}/lib
-ALL_TARGET = gmp # build with arbitrary precision numbers
+MAKE_FLAGS = CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib \
+ LMAJ="${LIBlrs_VERSION:R}" LMIN="${LIBlrs_VERSION:E}"
+ALL_TARGET = lrs lrsnash single
LIB_DEPENDS = devel/gmp
-BINARIES = 2gnash buffer gfourier glrs gnash gredund
-do-install:
-.for i in ${BINARIES}
- ${INSTALL_PROGRAM} ${WRKBUILD}/${i} ${PREFIX}/bin/
-.endfor
-
# A simple test to check it works
REGRESS_FILES =test.ine expected_outcome.ine openbsd_regress.sh
do-test:
@@ -39,10 +39,5 @@ do-test:
cp ${FILESDIR}/${i} ${WRKBUILD}
.endfor
cd ${WRKBUILD} && sh openbsd_regress.sh
-
-# resolve conflict with www/gnash and misc/buffer
-post-install:
- mv ${PREFIX}/bin/gnash ${PREFIX}/bin/lrsgnash
- mv ${PREFIX}/bin/buffer ${PREFIX}/bin/lrsbuffer
.include
Index: distinfo
===
RCS file: /cvs/ports/math/lrs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:27 - 1.2
+++ distinfo15 Nov 2020 17:31:45 -
@@ -1,2 +1,2 @@
-SHA256 (lrslib-042c.tar.gz) = U/mbUnE5e7XzF8lvo2Xtwaxx+ny6ApXIvXngiC9cOko=
-SIZE (lrslib-042c.tar.gz) = 168765
+SHA256 (lrslib-071a.tar.gz) = kmY26mjeRmJfFB9uAl3OlnzH5oz0v0pZc3XAY/XBFnM=
+SIZE (lrslib-071a.tar.gz) = 458590
Index: files/openbsd_regress.sh
===
RCS file: /cvs/ports/math/lrs/files/openbsd_regress.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 openbsd_regress.sh
--- files/openbsd_regress.sh7 Oct 2011 08:58:42 - 1.1.1.1
+++ files/openbsd_regress.sh15 Nov 2020 17:31:45 -
@@ -5,7 +5,7 @@ IN=test.ine
OUT=actual_outcome.ine
EXPECT=expected_outcome.ine
-./glrs ${IN} | grep -e '^ 1' 2>&1 | tee ${OUT}
+./lrsgmp ${IN} | grep -e '^ 1' 2>&1 | tee ${OUT}
DIFF=`diff -u ${OUT} ${EXPECT}`
if [ -n "${DIFF}" ]; then
Index: patches/patch-makefile
===
RCS file: /cvs/ports/math/lrs/patches/patch-makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-makefile
--- patches/patch-makefile 7 Oct 2011 08:58:42 - 1.1.1.1
+++ patches/patch-makefile 15 Nov 2020 17:31:45 -
@@ -1,153 +1,283 @@
-$OpenBSD: patch-makefile,v 1.1.1.1 2011/10/07 08:58:42 edd Exp $
+$OpenBSD$
-Honour CFLAGS, LDFLAGS, CPPFLAGS. Use dynamic linking.
+correct soname
+set LDFLAGS to fix build
+avoid library symlinks
+correct install target
makefile.orig Mon Apr 26 03:12:56 2010
-+++ makefile Mon Oct 3 12:14:16 2011
-@@ -15,87 +15,76 @@
- # make cleanto clean all executables
-
-
--#Select one of the following INCLUDE,LIB paths only needed for gmp version
--
--#linux at mcgill with gmp version 3
--INCLUDEDIR = /usr/local/include
--LIBDIR = /usr/local/lib
--
--#linux at mcgill with gmp version 2
--#INCLUDEDIR = /labs/cgm/gmp2/include
--#LIBDIR = /labs/cgm/gmp2/lib
--
--
- all: lrs.c lrslib.c lrslib.h lrsmp.c
Re: [UPDATE] SWI Prolog 8.3.11
Hi Charlie, Thanks for working on the port, and sorry for the delay! On Wed, Nov 11, 2020 at 06:03:08PM -0600, Charlie Burnett wrote: > For your reviewing pleasure, I've updated the "swi-prolog" package to > 8.3.11. 8.3.x is a development branch. Looking at the port's CVS history, we've always used the stable (even-numbered minor version) releases. https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/swi-prolog/Makefile https://www.swi-prolog.org/versions.txt So at this time, we'd want to target 8.2.x. Hopefully it's not too much different from 8.3.x. If you can send an updated diff, I'll happily review it. I did try building your diff, there's lots of messages like: tmp: No such file or directory If that's present when using 8.2.x we need to look into it. Are you using PORTS_PRIVSEP? If not, I'd recommend turning it on. Thanks! -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: [PATCH 00/11] first attempt at updating sphinx
It either needs the port splitting (py2-sphinx and py-sphinx) or sticking
with a Python 2.7-compatible version. Getting the required updates tested
and committed world be a good first step (py-six etc).
--
Sent from a phone, apologies for poor formatting.
On 15 November 2020 20:25:44 Brad Smith wrote:
It would be nice if someone more familiar with Python looked at this
Sphinx update. It's long overdue.
But one thing I noticed looking at part 11/11 of the py-sphinx update
this addition..
+RUN_DEPENDS =${BUILD_DEPENDS}
You flipped things around with RUN_DEPENDS and BUILD_DEPENDS. Don't do that.
It's too easy to get that one wrong and pull in unwanted dependencies as
a run time
dependency.
On 9/13/2020 9:58 AM, Aisha Tammy wrote:
Bump.
I know theres a lot of changes to do and things to take care off
and this is only the start, but can anyone tell me what I need to
improve on only this part?
I'll start doing recursive updates on deps and rdeps after this
part looks fine.
Aisha
On 9/7/20 8:42 PM, Aisha Tammy wrote:
I'm following this email with multiple patches for
updating sphinx to the latest version 3.2.1 and attaching
its new dependencies.
My apologies if this is not a good method to send patches
but this does make the work a lot cleaner imo.
There are a lot of things still left to do that I am not quite
an expert at but this should at least get the ball rolling
in the correct direction. I would love to get feedback from
everyone and get this working sometime soon.
I am still struggling with getting tests to run for
sphinx from inside the Makefile.
I also haven't done any reverse dependency tests yet given
that I don't know if this is even a worthwhile attempt.
Cheers,
Aisha
Aisha Tammy (11):
[update] sphinx_rtd_theme to 0.4.3
[update] py-six to 1.15.0
[update] py-snowballstemmer to 2.0.0
[new] py-sphinxcontrib-applehelp
[new] py-sphinxcontrib-devhelp
[new] py-sphinxcontrib-htmlhelp
[new] py-sphinxcontrib-jsmath
[new] py-sphinxcontrib-qthelp
[new] py-sphinxcontrib-serializinghtml
[new] py-sphinxcontrib-websupport
[update] py-sphinx to 3.2.1
devel/py-six/Makefile | 3 +-
devel/py-six/distinfo | 4 +-
textproc/py-snowballstemmer/Makefile | 5 +-
textproc/py-snowballstemmer/distinfo | 4 +-
textproc/py-snowballstemmer/pkg/PLIST | 26 +-
textproc/py-sphinx/Makefile | 64 +-
textproc/py-sphinx/distinfo | 4 +-
.../patch-doc_internals_release-process_rst | 18 +
textproc/py-sphinx/pkg/PLIST | 770 --
textproc/py-sphinx_rtd_theme/Makefile | 5 +-
textproc/py-sphinx_rtd_theme/distinfo | 4 +-
textproc/py-sphinx_rtd_theme/pkg/PLIST| 36 +-
textproc/py-sphinxcontrib-applehelp/Makefile | 30 +
textproc/py-sphinxcontrib-applehelp/distinfo | 2 +
textproc/py-sphinxcontrib-applehelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-applehelp/pkg/PLIST | 223 +
textproc/py-sphinxcontrib-devhelp/Makefile| 30 +
textproc/py-sphinxcontrib-devhelp/distinfo| 2 +
textproc/py-sphinxcontrib-devhelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-devhelp/pkg/PLIST | 213 +
textproc/py-sphinxcontrib-htmlhelp/Makefile | 31 +
textproc/py-sphinxcontrib-htmlhelp/distinfo | 2 +
textproc/py-sphinxcontrib-htmlhelp/pkg/DESCR | 1 +
textproc/py-sphinxcontrib-htmlhelp/pkg/PLIST | 229 ++
textproc/py-sphinxcontrib-jsmath/Makefile | 30 +
textproc/py-sphinxcontrib-jsmath/distinfo | 2 +
textproc/py-sphinxcontrib-jsmath/pkg/DESCR| 2 +
textproc/py-sphinxcontrib-jsmath/pkg/PLIST| 17 +
textproc/py-sphinxcontrib-qthelp/Makefile | 30 +
textproc/py-sphinxcontrib-qthelp/distinfo | 2 +
textproc/py-sphinxcontrib-qthelp/pkg/DESCR| 1 +
textproc/py-sphinxcontrib-qthelp/pkg/PLIST| 216 +
.../py-sphinxcontrib-serializinghtml/Makefile | 30 +
.../py-sphinxcontrib-serializinghtml/distinfo | 2 +
.../pkg/DESCR | 1 +
.../pkg/PLIST | 227 ++
textproc/py-sphinxcontrib-websupport/Makefile | 30 +
textproc/py-sphinxcontrib-websupport/distinfo | 2 +
.../py-sphinxcontrib-websupport/pkg/DESCR | 2 +
.../py-sphinxcontrib-websupport/pkg/PLIST | 60 ++
40 files changed, 2080 insertions(+), 282 deletions(-)
create mode 100644
textproc/py-sphinx/patches/patch-doc_internals_release-process_rst
create mode 100644 textproc/py-sphinxcontrib-applehelp/Makefile
create mode 100644 textproc/py-sphinxcontrib-applehelp/distinfo
create mode 100644 textproc/py-sphinxcontrib-applehelp/pkg/DESCR
create mode 100644 textproc/py-sphinxcontrib-applehelp/pkg/PLIST
create mode 100644 textproc/py-sphinxcontrib-devhelp/Makefile
create mode 100644 textproc/py-sphinxcontrib-devhelp/distinfo
create mode 100644 textproc/py-sphinxcontrib-devhelp/pkg/DESCR
create mode 100644 textproc/py-sphinxcontrib-devhelp/pkg/PLIST
create mode 100644
Re: [update] net/znc 1.7.5 -> 1.8.2 + new maintainer
On 2020/11/15 13:20, Aisha Tammy wrote:
> On 11/14/20 1:23 PM, Aisha Tammy wrote:
> > Hi,
> > Attached update for ZNC.
> > Also adds ICU unicode support and new LIB_DEPENDS on icu4c.
> >
> > Aisha
>
> Brad is busy and has kindly asked me to take the port.
>
> Attached with updated maintainer
This diff doesn't apply, something has gone wrong with the linebreaks.
>
> diff --git a/net/znc/Makefile b/net/znc/Makefile
> index 8b50172b0fc..9e372675e66 100644
> --- a/net/znc/Makefile
> +++ b/net/znc/Makefile
> @@ -2,18 +2,20 @@
> COMMENT= advanced IRC bouncer
> -DISTNAME=znc-1.7.5
> +DISTNAME=znc-1.8.2
> CATEGORIES= net
> MASTER_SITES=${HOMEPAGE}releases/
> HOMEPAGE=https://znc.in/
> -MAINTAINER= Brad Smith
> +MAINTAINER= Aisha Tammy
> # Apache 2.0
> PERMIT_PACKAGE= Yes
> -WANTLIB= c crypto m pthread ssl z ${COMPILER_LIBCXX}
> +WANTLIB= c crypto icuuc icudata m pthread ssl z ${COMPILER_LIBCXX}
> +
> +LIB_DEPENDS= textproc/icu4c
> MODULES= devel/cmake
> @@ -21,7 +23,7 @@ COMPILER= base-clang ports-gcc
> CONFIGURE_ARGS+= -DWANT_CYRUS=NO \
> -DWANT_I18N=NO \
> - -DWANT_ICU=NO
> + -DWANT_ICU=YES
> NO_TEST= Yes
> diff --git a/net/znc/distinfo b/net/znc/distinfo
> index 680a1eedded..833699626bc 100644
> --- a/net/znc/distinfo
> +++ b/net/znc/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (znc-1.7.5.tar.gz) = qJQeE4XIZUKHpEKAGNk0WUgunV7u34a+97Ag3cXyRyE=
> -SIZE (znc-1.7.5.tar.gz) = 2170656
> +SHA256 (znc-1.8.2.tar.gz) = /yOKrj8q4OROaDxK7hfcjk/dJhypN52DtIp9QiSI3g0=
> +SIZE (znc-1.8.2.tar.gz) = 2101215
> diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST
> index 92aede49ffd..a0d0011af30 100644
> --- a/net/znc/pkg/PLIST
> +++ b/net/znc/pkg/PLIST
> @@ -76,9 +76,7 @@ lib/znc/
> @so lib/znc/nickserv.so
> @so lib/znc/notes.so
> @so lib/znc/notify_connect.so
> -@so lib/znc/partyline.so
> @so lib/znc/perform.so
> -@so lib/znc/q.so
> @so lib/znc/raw.so
> @so lib/znc/route_replies.so
> @so lib/znc/sample.so
> @@ -168,6 +166,7 @@ share/znc/translations/fr-FR
> share/znc/translations/id-ID
> share/znc/translations/it-IT
> share/znc/translations/nl-NL
> +share/znc/translations/pl-PL
> share/znc/translations/ru-RU
> share/znc/webskins/
> share/znc/webskins/_default_/
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: afre...@cvs.openbsd.org 2020/11/15 12:17:37 Modified files: databases/p5-DBIx-Class-Schema-Loader: Makefile distinfo databases/p5-DBIx-Class-Schema-Loader/pkg: DESCR PLIST Log message: Update databases/p5-DBIx-Class-Schema-Loader to 0.07049 Originally from wen heping With additional tweaks by me Has some test failures, but they are very similar to the failures in DBIx::Class as reported upstream. https://rt.cpan.org/Public/Bug/Display.html?id=133170
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2020/11/15 12:14:12 Modified files: www/chromium/patches: patch-tools_gn_build_gen_py www/iridium/patches: patch-tools_gn_build_gen_py Added files: www/chromium/patches: patch-tools_gn_src_util_exe_path_cc www/iridium/patches: patch-tools_gn_src_util_exe_path_cc Log message: make it possible for gn to determine its own executable path so that regenerating rules with ninja is possible
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2020/11/15 11:32:04 Modified files: www/py-feedgenerator: Makefile distinfo Log message: update py-feedgenerator to 1.9.1 Main benefit is a reduced distfile size. Update from Vladimir Seleznev (MAINTAINER).
devel/pygame 1.9.3 -> 1.9.6
Here's an update of pygame from 1.9.3 to 1.9.6. The main benefits are some
improvements to python3 support and initial support for SDL2. For now,
the port continues to use SDL1 though.
There is some churn on the patches, but mostly because of a source tree
reorg that pygame did so each of the existing patches had to be reapplied
to different file.
Th update was tested on amd64 where everything compiles.
I also tried running most of the consumers to confirm they work and it all
seemed fine except for fretsonfire which crashes my box every time I try
to run it. This may be unrelated to pygame though as my box has been
fairly unstable under X ever since the drm update was done.
p.s. I've not checked if fretsonfire crashes with pygame 1.9.3 as this
game is pretty much on life support at this point...
ok?
Makefile |9 ++
distinfo |4 +-
patches/patch-Setup_in | 13 -
patches/patch-buildconfig_Setup_SDL1_in | 13 +
patches/patch-buildconfig_config_unix_py | 21 +++
patches/patch-config_unix_py | 21 ---
patches/patch-src_c_camera_h | 31 ++
patches/patch-src_c_camera_v4l2_c| 17
patches/patch-src_camera_h | 30 --
patches/patch-src_camera_v4l2_c | 16 ---
pkg/PLIST| 42 ++-
11 files changed, 118 insertions(+), 99 deletions(-)
Index: Makefile
===
RCS file: /cvs/ports/devel/pygame/Makefile,v
retrieving revision 1.39
diff -u -p -u -r1.39 Makefile
--- Makefile15 Nov 2020 03:31:52 - 1.39
+++ Makefile15 Nov 2020 05:37:09 -
@@ -2,11 +2,10 @@
COMMENT= set of Python modules designed for writing games
-MODPY_EGG_VERSION =1.9.3
+MODPY_EGG_VERSION =1.9.6
DISTNAME= pygame-${MODPY_EGG_VERSION}
PKGNAME = py-game-${MODPY_EGG_VERSION}
CATEGORIES=devel games
-REVISION = 4
HOMEPAGE= https://www.pygame.org/
@@ -41,8 +40,8 @@ TEST_IS_INTERACTIVE= x11
TEST_ENV = PYTHONPATH=${WRKSRC}
do-configure:
- ${SUBST_CMD} ${WRKSRC}/Setup.in
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN} config.py
+ ${SUBST_CMD} ${WRKSRC}/buildconfig/Setup.SDL1.in
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODPY_BIN}
buildconfig/config.py
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
@@ -51,7 +50,7 @@ post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}/data
${INSTALL_SCRIPT} ${WRKSRC}/examples/data/* ${EXAMPLESDIR}/data
${INSTALL_DATA_DIR} ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme.rst ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.rst ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/docs/*.{gif,html} ${DOCDIR}
.for i in ref tut
${INSTALL_DATA_DIR} ${DOCDIR}/$i
Index: distinfo
===
RCS file: /cvs/ports/devel/pygame/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo1 Apr 2018 09:27:43 - 1.9
+++ distinfo15 Nov 2020 05:37:09 -
@@ -1,2 +1,2 @@
-SHA256 (pygame-1.9.3.tar.gz) = dRAhgZvcDL5cvVGQSrtv+emu5bDolVrwIoTQ531snsI=
-SIZE (pygame-1.9.3.tar.gz) = 2974541
+SHA256 (pygame-1.9.6.tar.gz) = MBxkKMCIDs1KnjlRuA5TnDOGO2/zVqRD2xdY3k8peVc=
+SIZE (pygame-1.9.6.tar.gz) = 3223131
Index: patches/patch-Setup_in
===
RCS file: patches/patch-Setup_in
diff -N patches/patch-Setup_in
--- patches/patch-Setup_in 15 Nov 2020 03:31:52 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-Setup_in,v 1.5 2020/11/15 03:31:52 daniel Exp $
-Index: Setup.in
Setup.in.orig
-+++ Setup.in
-@@ -47,7 +47,7 @@ base src/base.c $(SDL) $(DEBUG)
- cdrom src/cdrom.c $(SDL) $(DEBUG)
- color src/color.c $(SDL) $(DEBUG)
- constants src/constants.c $(SDL) $(DEBUG)
--display src/display.c $(SDL) $(DEBUG)
-+display src/display.c $(SDL) $(DEBUG) -I${X11BASE}/include
- event src/event.c $(SDL) $(DEBUG)
- fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
- key src/key.c $(SDL) $(DEBUG)
Index: patches/patch-buildconfig_Setup_SDL1_in
===
RCS file: patches/patch-buildconfig_Setup_SDL1_in
diff -N patches/patch-buildconfig_Setup_SDL1_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-buildconfig_Setup_SDL1_in 15 Nov 2020 05:37:09 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: buildconfig/Setup.SDL1.in
+--- buildconfig/Setup.SDL1.in.orig
buildconfig/Setup.SDL1.in
+@@ -48,6 +48,7 @@ cdrom src_c/cdrom.c $(SDL) $(DEBUG)
+ color src_c/color.c $(SDL) $(DEBUG)
+ constants src_c/constants.c $(SDL) $(DEBUG)
+ display src_c/display.c $(SDL) $(DEBUG)
++display
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/11/15 10:45:34 Modified files: x11/xfce4/tumbler: Makefile distinfo x11/xfce4/tumbler/pkg: PLIST Log message: Update to tumbler 0.3.1. Disable the new epub thumbnailer otherwise it would bring in libgepub and webkitgtk4..
net/toot got broken recently
net/toot got broken recently. I updated my packages 1 or 2 days
ago, it worked. I updated today and it's now broken.
$ toot
Traceback (most recent call last):
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
583, in _build_master
ws.require(__requires__)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
900, in require
needed = self.resolve(parse_requirements(requirements))
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
791, in resolve
raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (urllib3 1.26.0
(/usr/local/lib/python3.8/site-packages),
Requirement.parse('urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1'), {'requests'})
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/local/bin/toot", line 6, in
from pkg_resources import load_entry_point
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3252, in
def _initialize_master_working_set():
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3235, in _call_aside
f(*args, **kwargs)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
3264, in _initialize_master_working_set
working_set = WorkingSet._build_master()
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
585, in _build_master
return cls._build_from_requirements(__requires__)
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
598, in _build_from_requirements
dists = ws.resolve(reqs, Environment())
File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line
786, in resolve
raise DistributionNotFound(req, requirers)
pkg_resources.DistributionNotFound: The
'urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1' distribution was not found and is
required by requests
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/11/15 10:29:00 Modified files: www/seamonkey : Makefile Log message: add BDEP on nasm for AV1 support, as spotted by ajacoutot@
Re: CVS: cvs.openbsd.org: ports
On 2020/11/15 07:40, Jeremie Courreges-Anglas wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: j...@cvs.openbsd.org2020/11/15 07:40:50
>
> Modified files:
> devel/ccache : Makefile
>
> Log message:
> Typo in comment
>
> Noticed after learning about a ccache-4.0 release and checking our port. ;)
>
fwiw, here's a diff for the update - I haven't committed it because it
introduces circular dependencies if building from scratch with USE_CCACHE.
Index: Makefile
===
RCS file: /cvs/ports/devel/ccache/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile15 Nov 2020 14:40:50 - 1.65
+++ Makefile15 Nov 2020 16:21:24 -
@@ -2,7 +2,7 @@
COMMENT = compiler cache
-V =3.7.12
+V =4.0
DISTNAME = ccache-$V
CATEGORIES = devel
@@ -16,13 +16,14 @@ WANTLIB += c m z
MASTER_SITES = https://github.com/ccache/ccache/releases/download/v$V/
-CONFIGURE_STYLE = gnu
+MODULES = devel/cmake
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-# This port should not have build/run dependencies.
NO_CCACHE =Yes
DWZ = :
+CFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700
+CXXFLAGS +=-D_BSD_SOURCE -D_XOPEN_SOURCE=700
# Failure in cpp1 test suite appears to be due to an embedded filename
# in a .o file present in one file, and not present in the file being
Index: distinfo
===
RCS file: /cvs/ports/devel/ccache/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo2 Oct 2020 18:45:00 - 1.45
+++ distinfo15 Nov 2020 16:21:24 -
@@ -1,2 +1,2 @@
-SHA256 (ccache-3.7.12.tar.gz) = 0qvojUwoPOlg4jNYMGESexVv+wJ8baPPEHcPwMckQZQ=
-SIZE (ccache-3.7.12.tar.gz) = 506948
+SHA256 (ccache-4.0.tar.gz) = rJevhmeQKOvIVVyZMYNSWI/1D1Ffw6f47SGorTZ+PUU=
+SIZE (ccache-4.0.tar.gz) = 518384
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 5 Feb 2020 00:12:44 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,50 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2020/02/05 00:12:44 sthen Exp $
-
-remove gmake-isms - this port needs to have no dependencies (for USE_CCACHE)
-
-get rid of warning spam during build,
-: $(if $(quiet),@echo "...")' expands to ''
-
-
-Index: Makefile.in
Makefile.in.orig
-+++ Makefile.in
-@@ -105,19 +105,15 @@ files_to_distclean = Makefile config.h config.log conf
- all: ccache$(EXEEXT)
-
- ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
-- $(if $(quiet),@echo " LD $@")
- $(Q)$(CC) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
-
- ccache.1: doc/ccache.1
-- $(if $(quiet),@echo " CP $@")
-- $(Q)cp $< $@
-+ $(Q)cp $> $@
-
- .PHONY: install
- install: ccache$(EXEEXT) @disable_man@ccache.1
-- $(if $(quiet),@echo " INSTALL ccache$(EXEEXT)")
- $(Q)$(installcmd) -d $(DESTDIR)$(bindir)
- $(Q)$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
--@disable_man@ $(if $(quiet),@echo " INSTALL ccache.1")
- @disable_man@ $(Q)$(installcmd) -d $(DESTDIR)$(mandir)/man1
- @disable_man@ $(Q)-$(installcmd) -m 644 ccache.1 $(DESTDIR)$(mandir)/man1/
-
-@@ -125,9 +121,6 @@ install: ccache$(EXEEXT) @disable_man@ccache.1
- clean:
- rm -rf $(files_to_clean)
-
--$(non_3pp_objs) $(test_objs): CFLAGS += @more_warnings@
--
--src/snprintf.o: CFLAGS += @no_implicit_fallthrough_warning@
- $(zlib_objs): CPPFLAGS += -include config.h
- $(zlib_objs): CFLAGS += @no_implicit_fallthrough_warning@
-
-@@ -176,7 +169,6 @@ installcheck: ccache$(EXEEXT) unittest/run$(EXEEXT)
- CCACHE=$(bindir)/ccache CC='$(CC)' $(BASH) $(srcdir)/test/run
-
- .c.o:
-- $(if $(quiet),@echo " CC $@")
- $(Q)$(CC) $(all_cppflags) $(all_cflags) -c -o $@ $<
-
- @include_dev_mk@
Index: patches/patch-cmake_config_h_in
===
RCS file: patches/patch-cmake_config_h_in
diff -N patches/patch-cmake_config_h_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cmake_config_h_in 15 Nov 2020 16:21:24 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: cmake/config.h.in
+--- cmake/config.h.in.orig
cmake/config.h.in
+@@ -32,7 +32,7 @@
+
+ #if defined(__SunOS_5_8) || defined(__SunOS_5_9) || defined(__SunOS_5_10)
+ # define _XOPEN_SOURCE 500
+-#elif !defined(__SunOS_5_11) && !defined(__APPLE__)
++#elif !defined(__SunOS_5_11) && !defined(__APPLE__) && !defined(__OpenBSD__)
+ # define _XOPEN_SOURCE
+ #endif
+
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 10 Nov 2019 18:38:47 -
NEW: net/dog
ok to import this rust port? some cargo-wrangling was required, otherwise it tries to fetch some parts which aren't distributed on crates.io. $ pkg_info dog Information for inst:dog-0.1.0 Comment: command-line DNS lookup tool Description: dog is an open-source DNS client for the command-line. It has colourful output, supports the DoT and DoH protocols, and can emit JSON. Maintainer: The OpenBSD ports mailing-list WWW: https://dns.lookup.dog/ dog.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/15 08:15:16 Modified files: mail/mutt : Makefile distinfo mail/mutt/patches: patch-main_c Log message: update to mutt-2.0.1
Re: [UPDATE] blender 2.81
On 2020/11/14 16:18, Andrea Fleckenstein wrote: > Hello all, > > please see below for a diff to update blender to version 2.81. Raphael > Graf (cc'd) sent an update for 2.80 back in August 2019 which did not > get committed, and the 2.81 update here is based off that. I was trying > to compile 2.80 but was having a bit of trouble getting the numpy > header files into the python 3.7 include dir. > > Luckily with 2.81 we can use python 3.8, and as an extra incentive to > test I believe this is the last port that uses 3.7 > > some optional dependencies we don't have in ports (like opensubdiv), > which I can look into porting soon, and I will look at enabling some of > the optional dependencies in general for future revisions. > > Cheers, > Andrea > > diff -bur /usr/ports/graphics/blender/Makefile ./Makefile > --- /usr/ports/graphics/blender/Makefile Fri Nov 13 20:37:45 2020 > +++ ./MakefileSat Nov 14 16:14:02 2020 The emailed patch doesn't apply correctly (rejects in some of the patches/* files), plus it looks like it's missing some parts as there are some "only in ..." lines in the diff output. Can you please either send a cvs diff, or just send a tar of the whole dir and I can do the cvs-wrangling? (Or, to save time if the diff doesn't work, include both :) My standard method for generating cvs diffs: update the files in the port dir - if I have a copy that I've been working on in another directory I normally use "rsync -avC --delete" for this (the C flag skips CVS directories etc automatically), then "cvs add" / "cvs rm" as necessary then generate the diff with "cvs diff -uNp" to get a full diff with the additions/removals).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/11/15 07:56:34 Modified files: audio/lmms : Makefile distinfo audio/lmms/patches: patch-CMakeLists_txt Log message: update to lmms-1.2.2, mostly from Dimitri Karamazov who takes maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/11/15 07:40:50 Modified files: devel/ccache : Makefile Log message: Typo in comment Noticed after learning about a ccache-4.0 release and checking our port. ;)
Re: net/toot got broken recently
On 2020/11/15 14:40, Solene Rapenne wrote:
> net/toot got broken recently. I updated my packages 1 or 2 days
> ago, it worked. I updated today and it's now broken.
Pretty much everything python doing HTTP requests got broken by the
untested py-urllib3 update that got committed recently.
Update py-requests to unbreak.
> $ toot
> Traceback (most recent call last):
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 583, in _build_master
> ws.require(__requires__)
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 900, in require
> needed = self.resolve(parse_requirements(requirements))
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 791, in resolve
> raise VersionConflict(dist, req).with_context(dependent_req)
> pkg_resources.ContextualVersionConflict: (urllib3 1.26.0
> (/usr/local/lib/python3.8/site-packages),
> Requirement.parse('urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1'), {'requests'})
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
> File "/usr/local/bin/toot", line 6, in
> from pkg_resources import load_entry_point
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 3252, in
> def _initialize_master_working_set():
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 3235, in _call_aside
> f(*args, **kwargs)
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 3264, in _initialize_master_working_set
> working_set = WorkingSet._build_master()
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 585, in _build_master
> return cls._build_from_requirements(__requires__)
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 598, in _build_from_requirements
> dists = ws.resolve(reqs, Environment())
> File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py",
> line 786, in resolve
> raise DistributionNotFound(req, requirers)
> pkg_resources.DistributionNotFound: The
> 'urllib3!=1.25.0,!=1.25.1,<1.26,>=1.21.1' distribution was not found and is
> required by requests
>
Re: CVS: cvs.openbsd.org: ports
It feels like deja vu. On 11/15/2020 4:22 AM, Denis Fondras wrote: CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:22:32 Log message: TimescaleDB is an open-source database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support. https://www.timescale.com/ Based on the work by Martin Got, thanks. Help & OK sthen@ Status: Vendor Tag: denis Release Tags: denis_20201115 U ports/databases/timescaledb/Makefile U ports/databases/timescaledb/distinfo U ports/databases/timescaledb/pkg/DESCR U ports/databases/timescaledb/pkg/PLIST U ports/databases/timescaledb/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2020/11/15 05:28:27 Modified files: graphics/piglit: Makefile Added files: graphics/piglit/patches: patch-tests_util_piglit-subprocess_c Log message: Avoid running atexit(3) hooks in the child which fails horribly since it will try to to clean up the thread pool created by the Mesa radeonsi driver that doesn't actually exist in the child, resulting in a hang of several tests. ok jsg@
Re: libinotify, add README
Ok. I need that tuning while using nextcloudclient.
Em sáb., 14 de nov. de 2020 às 08:50, Stuart Henderson
escreveu:
> The "seafile client doesn't sync files" post on misc@ made me notice
> that there's no warning for libinotify-based ports like we have for
> glib about increasing fd limits for kqueue file monitoring.
> It probably won't help _that_ much but I think it's probably worth
> adding a pkg-readme that we can point people to (I've based it on
> glib's). I added debug packages while there.
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libinotify/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile19 Sep 2019 13:33:57 - 1.13
> +++ Makefile14 Nov 2020 12:47:13 -
> @@ -6,7 +6,7 @@ GH_ACCOUNT =libinotify-kqueue
> GH_PROJECT = libinotify-kqueue
> GH_TAGNAME = 20170711
> PKGNAME = libinotify-${GH_TAGNAME}
> -REVISION = 0
> +REVISION = 1
>
> SHARED_LIBS = inotify 2.1
>
> @@ -18,6 +18,8 @@ MAINTAINER = Kirill Bychkov PERMIT_PACKAGE = Yes
>
> WANTLIB = pthread
> +
> +DEBUG_PACKAGES = ${BUILD_PACKAGES}
>
> SEPARATE_BUILD = Yes
> CONFIGURE_STYLE = autoreconf
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/libinotify/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 19 Sep 2019 13:33:57 - 1.3
> +++ pkg/PLIST 14 Nov 2020 12:47:13 -
> @@ -3,7 +3,7 @@ include/inotify/
> include/inotify/sys/
> include/inotify/sys/inotify.h
> lib/inotify/
> -lib/inotify/libinotify.a
> +@static-lib lib/inotify/libinotify.a
> lib/inotify/libinotify.la
> @lib lib/inotify/libinotify.so.${LIBinotify_VERSION}
> lib/pkgconfig/libinotify.pc
> @@ -14,3 +14,4 @@ lib/pkgconfig/libinotify.pc
> @man man/man3/inotify_rm_watch.3
> @man man/man3/inotify_set_param.3
> @man man/man3/libinotify.3
> +share/doc/pkg-readmes/${PKGSTEM}
> Index: pkg/README
> ===
> RCS file: pkg/README
> diff -N pkg/README
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/README 14 Nov 2020 12:47:13 -
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +
>
> ++---
> +| Running ${PKGSTEM} on OpenBSD
>
> ++---
> +
> +libinotify uses kqueue(2) to monitor for changed files. This only works
> +up to the system's "open file descriptors" limit - if software using
> +libinotify needs to handle large directories, the kern.maxfiles
> +sysctl(8) should be increased by adding an entry in sysctl.conf(5) and
> +the user's login(1) class modified accordingly by bumping the "cur" and
> +"max" "openfiles" limit in login.conf(5).
>
> --
Adriano Barbosa
Sent from my phone. Sorry for typos.
audio/chromaprint
Simple update diff to the latest version.
Rafael
Index: Makefile
===
RCS file: /cvs/ports/audio/chromaprint/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- Makefile23 Aug 2019 20:18:04 - 1.13
+++ Makefile15 Nov 2020 11:53:36 -
@@ -4,7 +4,7 @@ COMMENT = audio fingerprint extraction
GH_ACCOUNT = acoustid
GH_PROJECT = chromaprint
-GH_TAGNAME = v1.4.3
+GH_TAGNAME = v1.5.0
SHARED_LIBS = chromaprint 2.0 # 1.4.3
Index: distinfo
===
RCS file: /cvs/ports/audio/chromaprint/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo23 Aug 2019 20:18:04 - 1.3
+++ distinfo15 Nov 2020 11:53:36 -
@@ -1,2 +1,2 @@
-SHA256 (chromaprint-1.4.3.tar.gz) =
1K5llig6rXoBWlsERQEgVMY0pLkynssjAAzTVLQKKDs=
-SIZE (chromaprint-1.4.3.tar.gz) = 613718
+SHA256 (chromaprint-1.5.0.tar.gz) =
XI4NV5yzR4kAaZEQqpYcFVKkIqGHQc9n3WITaxuHfHs=
+SIZE (chromaprint-1.5.0.tar.gz) = 615221
Index: patches/patch-tests_test_utils_cpp
===
RCS file: patches/patch-tests_test_utils_cpp
diff -N patches/patch-tests_test_utils_cpp
--- patches/patch-tests_test_utils_cpp 23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_cpp,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.cpp
tests/test_utils.cpp.orig
-+++ tests/test_utils.cpp
-@@ -2,6 +2,7 @@
- #include
- #include
- #include "utils.h"
-+#include "test_utils.h"
-
- using namespace chromaprint;
-
-@@ -91,4 +92,12 @@ TEST(Utils, CountSetBits64) {
- EXPECT_EQ(56, CountSetBits(0xFFU));
- EXPECT_EQ(64, CountSetBits(0xU));
- EXPECT_EQ(8, CountSetBits(0x0101010101010101U));
-+}
-+
-+TEST(Utils, LoadAudioFile) {
-+ std::vector data = LoadAudioFile("data/test_mono_44100.raw");
-+ ASSERT_EQ(data.size(), 176400/2);
-+ EXPECT_EQ(data[1000], 0);
-+ EXPECT_EQ(data[2000], 107);
-+ EXPECT_EQ(data[3000], 128);
- }
Index: patches/patch-tests_test_utils_h
===
RCS file: patches/patch-tests_test_utils_h
diff -N patches/patch-tests_test_utils_h
--- patches/patch-tests_test_utils_h23 Aug 2019 20:18:04 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_test_utils_h,v 1.1 2019/08/23 20:18:04 cwen Exp $
-
-Make tests endian neutral. Can be removed with chromaprint>=1.4.4:
-https://github.com/acoustid/chromaprint/commit/8d5f2ca81db8fae6b59b6b9b8bda91526507dbd1
-
-Index: tests/test_utils.h
tests/test_utils.h.orig
-+++ tests/test_utils.h
-@@ -31,11 +31,15 @@ inline std::vector LoadAudioFile(const std::str
- {
- std::string path = TESTS_DIR + file_name;
- std::ifstream file(path.c_str(), std::ifstream::in |
std::ifstream::binary);
-- file.seekg(0, std::ios::end);
-- int length = file.tellg();
-- file.seekg(0, std::ios::beg);
-- std::vector data(length / 2);
-- file.read((char *)[0], length);
-+ uint8_t buf[4096];
-+ std::vector data;
-+ while (!file.eof()) {
-+ file.read((char *) buf, 4096);
-+ size_t nread = file.gcount();
-+ for (size_t i = 0; i < nread - 1; i += 2) {
-+ data.push_back((int16_t) (((uint16_t) buf[i+1] << 8) |
((uint16_t) buf[i])));
-+ }
-+ }
- file.close();
- return data;
- }
Re: Update: audio/puddletag-2.0.1
On Fri Nov 13, 2020 at 05:00:23PM +, Stuart Henderson wrote: > On 2020/11/12 06:41, Rafael Sadowski wrote: > > On Fri Oct 23, 2020 at 09:10:49PM +0200, Rafael Sadowski wrote: > > > On Wed Sep 16, 2020 at 09:46:45PM +0100, Stuart Henderson wrote: > > > > On 2020/09/16 22:39, Rafael Sadowski wrote: > > > > > On Wed Sep 16, 2020 at 09:10:16PM +0100, Stuart Henderson wrote: > > > > > > > > > > > > > > Does anyone want to leave an OK? > > > > > > > > > > > > Surely the rabbit hole needs following otherwise the update breaks > > > > > > working functionality? > > > > > > > > > > No, that has never worked before. See: > > > > > > > > > > $ puddletag > > > > > puddletag Version: 1.2.0 > > > > > Locale: en_US > > > > > Object::disconnect: Unexpected null parameter > > > > > Error loading quodlibetlib: No module named quodlibet.config > > > > > > > > > > This is about my initial DESCR upgrade: > > > > > > > > > > > > > > > +Doing web lookups > > > > > > > > > > +using Amazon (including cover art), Discogs (does cover > > > > > > > > > > art too!), FreeDB and > > > > > > > > > > +MusicBrainz is also supported. > > > > > > > > > > I took that out again, because it has never worked before. > > > > > > > > No idea about using it with quodlibet but it used to do ID-based > > > > tagging using chromaprint if you installed the relevant package. > > > > Not sure if that is still working with what's in-tree - I can't > > > > test now (I won't run X on my workstation until I have time to do an > > > > install on a separate HD to test with, the filesystem corruption > > > > from the hangs was getting too much). > > > > > > > > > > If you describe to me how I can test it, I can do it for you/us. For me > > > the updated version behaves like the in-tree version. > > > > > > Rafael > > > > > > > Friendly reminder. > > pkg_add chromaprint puddletag > puddletag & > Windows / tick "Tag sources" > Open a dir containing an album > Select all files in the album > In the "Tag sources" window set source to AcoustID > Click the Search button > Thanks Stuart, I can confirm FreeDB and MusicBrainz works here but unfortunately AcoustID do not.
UPDATE: xvidcore 1.3.7
Here is an update to xvidcore 1.3.7.
Changes since 1.3.6:
Fix for a regression in initializing the Inter matrix with MPEG Quantization
Changes since 1.3.5:
Fix for various, long-standing and potentially critical security
vulnerabilities in the decoder (credit to OSS-Fuzz)
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xvidcore/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile19 Aug 2019 06:04:23 - 1.23
+++ Makefile15 Nov 2020 06:32:43 -
@@ -2,13 +2,12 @@
COMMENT= ISO MPEG-4 compliant video codec
-DISTNAME= xvidcore-1.3.5
-REVISION= 0
+DISTNAME= xvidcore-1.3.7
CATEGORIES=multimedia
MASTER_SITES= https://downloads.xvid.com/downloads/
EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= xvidcore4.4
+SHARED_LIBS= xvidcore5.0
HOMEPAGE= https://www.xvid.com/
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/xvidcore/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo2 Jun 2019 08:31:02 - 1.12
+++ distinfo15 Nov 2020 06:30:49 -
@@ -1,2 +1,2 @@
-SHA256 (xvidcore-1.3.5.tar.bz2) = fCDyefnY6JBC6FRl0ryxsxMM6x7Owz1USMRYnXjwELQ=
-SIZE (xvidcore-1.3.5.tar.bz2) = 698846
+SHA256 (xvidcore-1.3.7.tar.bz2) = ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=
+SIZE (xvidcore-1.3.7.tar.bz2) = 698615
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/multimedia/xvidcore/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 19 Sep 2014 01:44:47 - 1.4
+++ pkg/PLIST 15 Nov 2020 06:35:55 -
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2014/09/19 01:44:47 brad Exp $
include/xvid.h
-lib/libxvidcore.a
+@static-lib lib/libxvidcore.a
@lib lib/libxvidcore.so.${LIBxvidcore_VERSION}
Re: UPDATE: xvidcore 1.3.7
On Sun Nov 15, 2020 at 02:08:25AM -0500, Brad Smith wrote:
> Here is an update to xvidcore 1.3.7.
I'm happy about this kind of update. The question I ask myself, did you
build all consumer?
>
>
> Changes since 1.3.6:
> Fix for a regression in initializing the Inter matrix with MPEG Quantization
>
> Changes since 1.3.5:
> Fix for various, long-standing and potentially critical security
> vulnerabilities in the decoder (credit to OSS-Fuzz)
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/multimedia/xvidcore/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- Makefile 19 Aug 2019 06:04:23 - 1.23
> +++ Makefile 15 Nov 2020 06:32:43 -
> @@ -2,13 +2,12 @@
>
> COMMENT= ISO MPEG-4 compliant video codec
>
> -DISTNAME=xvidcore-1.3.5
> -REVISION=0
> +DISTNAME=xvidcore-1.3.7
> CATEGORIES= multimedia
> MASTER_SITES=https://downloads.xvid.com/downloads/
> EXTRACT_SUFX=.tar.bz2
>
> -SHARED_LIBS= xvidcore4.4
> +SHARED_LIBS= xvidcore5.0
>
> HOMEPAGE=https://www.xvid.com/
>
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/multimedia/xvidcore/distinfo,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 distinfo
> --- distinfo 2 Jun 2019 08:31:02 - 1.12
> +++ distinfo 15 Nov 2020 06:30:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (xvidcore-1.3.5.tar.bz2) =
> fCDyefnY6JBC6FRl0ryxsxMM6x7Owz1USMRYnXjwELQ=
> -SIZE (xvidcore-1.3.5.tar.bz2) = 698846
> +SHA256 (xvidcore-1.3.7.tar.bz2) =
> ruqulS1Ns5UkmDmjvQOEHWhEhD9aT4TCcf+I96oaz/c=
> +SIZE (xvidcore-1.3.7.tar.bz2) = 698615
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/multimedia/xvidcore/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- pkg/PLIST 19 Sep 2014 01:44:47 - 1.4
> +++ pkg/PLIST 15 Nov 2020 06:35:55 -
> @@ -1,4 +1,4 @@
> @comment $OpenBSD: PLIST,v 1.4 2014/09/19 01:44:47 brad Exp $
> include/xvid.h
> -lib/libxvidcore.a
> +@static-lib lib/libxvidcore.a
> @lib lib/libxvidcore.so.${LIBxvidcore_VERSION}
>
Re: CVS: cvs.openbsd.org: ports
https://m.youtube.com/watch?v=wp49snF3KmE On 2020/11/15 04:27, Brad Smith wrote: > It feels like deja vu. > > On 11/15/2020 4:22 AM, Denis Fondras wrote: > > CVSROOT:/cvs > > Module name:ports > > Changes by: de...@cvs.openbsd.org 2020/11/15 02:22:32 > > > > Log message: > > TimescaleDB is an open-source database designed to make SQL scalable > > for time-series data. It is engineered up from PostgreSQL and > > packaged as a PostgreSQL extension, providing automatic partitioning > > across time and space (partitioning key), as well as full SQL > > support. > > https://www.timescale.com/ > > Based on the work by Martin Got, thanks. > > Help & OK sthen@ > > Status: > > Vendor Tag:denis > > Release Tags: denis_20201115 > > U ports/databases/timescaledb/Makefile > > U ports/databases/timescaledb/distinfo > > U ports/databases/timescaledb/pkg/DESCR > > U ports/databases/timescaledb/pkg/PLIST > > U ports/databases/timescaledb/pkg/README > > No conflicts created by this import > > >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 03:02:20 Modified files: devel/py-cflow2dot: Makefile distinfo devel/py-cflow2dot/pkg: PLIST Removed files: devel/py-cflow2dot/patches: patch-setup_py Log message: Update to py-cflow2dot-0.2.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 02:45:18 Modified files: devel/perltidy : Makefile distinfo devel/perltidy/pkg: PLIST Log message: Update to perltidy-20201001.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:39:52 Modified files: databases : Makefile Log message: Import timescaledb-1.7.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:22:32 Log message: TimescaleDB is an open-source database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support. https://www.timescale.com/ Based on the work by Martin Got, thanks. Help & OK sthen@ Status: Vendor Tag: denis Release Tags: denis_20201115 U ports/databases/timescaledb/Makefile U ports/databases/timescaledb/distinfo U ports/databases/timescaledb/pkg/DESCR U ports/databases/timescaledb/pkg/PLIST U ports/databases/timescaledb/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:16:26 Log message: TimescaleDB is an open-source database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support. https://www.timescale.com/ Based on the work by Martin Got, thanks. Help & OK sthen@ Status: Vendor Tag: denis Release Tags: denis_20201115 U ports/databases/timescaledb/Makefile U ports/databases/timescaledb/distinfo U ports/databases/timescaledb/pkg/DESCR U ports/databases/timescaledb/pkg/PLIST U ports/databases/timescaledb/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 02:16:01 Modified files: devel/p5-Test-Fatal: Makefile distinfo Log message: Update to p5-Test-Fatal-0.016.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:13:54 Log message: TimescaleDB is an open-source database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support. https://www.timescale.com/ Based on the work of Martin Got. Help and OK sthen@ Status: Vendor Tag: denis Release Tags: denis_20201115 U ports/databases/timescaledb/Makefile U ports/databases/timescaledb/distinfo U ports/databases/timescaledb/pkg/DESCR U ports/databases/timescaledb/pkg/PLIST U ports/databases/timescaledb/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: de...@cvs.openbsd.org 2020/11/15 02:12:13 Log message: TimescaleDB is an open-source database designed to make SQL scalable for time-series data. It is engineered up from PostgreSQL and packaged as a PostgreSQL extension, providing automatic partitioning across time and space (partitioning key), as well as full SQL support. https://www.timescale.com/ Based on the work of Martin Got, thanks. Help and OK sthen@ Status: Vendor Tag: denis Release Tags: denis_20201115 N ports/databases/timescaledb/Makefile N ports/databases/timescaledb/distinfo N ports/databases/timescaledb/pkg/DESCR N ports/databases/timescaledb/pkg/PLIST N ports/databases/timescaledb/pkg/README No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 01:42:53 Modified files: devel/p5-System-Command: Makefile distinfo Log message: Update to p5-System-Command-1.121.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 01:31:01 Modified files: devel/p5-Parallel-Forker: Makefile distinfo Log message: Update to p5-Parallel-Forker-1.260.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 01:22:32 Modified files: devel/p5-Log-Any-Adapter-Callback: Makefile distinfo devel/p5-Log-Any-Adapter-Callback/pkg: PLIST Log message: Update to p5-Log-Any-Adapter-Callback-0.101.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 01:17:08 Modified files: devel/p5-Glib-Object-Introspection: Makefile distinfo Log message: Update to p5-Glib-Object-Introspection-0.049.
Re: devel/boost: drop python2 support and speed up make fake
On 11/13/2020 6:33 PM, Stuart Henderson wrote:
On 2020/11/13 17:41, Jeremie Courreges-Anglas wrote:
On Fri, Nov 13 2020, Stuart Henderson wrote:
On 2020/11/08 01:46, Jeremie Courreges-Anglas wrote:
This diff drops boost_python27 and boost_numpy27.
Dropping boost_python27* needs work first;
That is correct, I had a draft mail about it but ENOTIME.
tl;dr my grep-fu failed me, sorry folks.
This is what I came up with to disable just boost_numpy27. A bit
hackish but seems to work fine.
BTW the only failure in an i386 build with the original diff was
py-tagpy (openimageio is broken on at least i386/powerpc, and
vegastrike is amd64-only as one of the deps is broken on i386).
Nothing on i386 had problems with removing the b2 files.
I've sent out a py-tagpy diff, openimageio is literally just
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} and bump REVISION (I'm
building blender with it to be sure, which will take a while, but
unlikely to have any problems). I think those two make sense
regardless.
Then we can either go for your new diff, or the original one and
mark vegastrike broken for now..
I'd prefer if we go with the original diff.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/11/15 01:06:53 Modified files: devel/p5-Class-C3: Makefile distinfo Log message: Update to p5-Class-C3-0.35.
