update multimedia/mlt 6.6.0
Update multimedia/mlt to the latest release. Also fixes the build with clang. I don't use melt, but the tests only have one failure (mentioned in the Makefile) and it could play a few sample videos. A minor lib bump is required, but I'm not confident it's sufficient, so the patch cranks the major. - Matthew Martin diff --git Makefile Makefile index f85a35f6c36..65519303346 100644 --- Makefile +++ Makefile @@ -2,19 +2,17 @@ COMMENT-main = multimedia transformations framework COMMENT-gpl2 = GPLv2-licensed modules for mlt -VERSION = 6.0.0 +VERSION = 6.6.0 DISTNAME = mlt-${VERSION} PKGNAME-main = ${DISTNAME} PKGNAME-gpl2 = mlt-gpl2-${VERSION} -REVISION-main =3 -REVISION-gpl2 =1 # XXX versions should be kept in sync together -SHARED_LIBS = mlt 1.1 -SHARED_LIBS += mlt++ 1.1 +SHARED_LIBS = mlt 2.0 +SHARED_LIBS += mlt++ 2.0 CATEGORIES = multimedia devel -HOMEPAGE = http://www.mltframework.org/ +HOMEPAGE = https://www.mltframework.org/ MAINTAINER = KDE porting team@@ -32,7 +30,7 @@ WANTLIB-gpl2 = ${COMPILER_LIBCXX} ${MODQT4_WANTLIB} lib/qt4/QtGui WANTLIB-gpl2 += lib/qt4/QtSvg lib/qt4/QtXml lib/qt4/QtOpenGL WANTLIB-gpl2 += X11 exif m mlt mlt++ pthread samplerate -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mlt/} +MASTER_SITES = https://github.com/mltframework/mlt/releases/download/v${VERSION}/ EXTRACT_SUFX = .tar.gz MULTI_PACKAGES = -main -gpl2 diff --git distinfo distinfo index 97ca536deaf..b9f40dcf92d 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (mlt-6.0.0.tar.gz) = MXh0z8f8Uo3duzp6Mv1GNyquIr3EUnvhz7Vck/pm470= -SIZE (mlt-6.0.0.tar.gz) = 1281478 +SHA256 (mlt-6.6.0.tar.gz) = KMvFl09y7yKNYkpYgJx8gFU3L19i9YgtwFUJnURLLN0= +SIZE (mlt-6.6.0.tar.gz) = 1365768 diff --git patches/patch-src_framework_Makefile patches/patch-src_framework_Makefile index df2402ea8a3..196abbcb6ec 100644 --- patches/patch-src_framework_Makefile +++ patches/patch-src_framework_Makefile @@ -1,6 +1,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $ src/framework/Makefile.origSun Jun 29 22:23:17 2014 -+++ src/framework/Makefile Wed Jul 9 09:43:49 2014 +Index: src/framework/Makefile +--- src/framework/Makefile.orig src/framework/Makefile @@ -1,7 +1,6 @@ include ../../config.mak include config.mak @@ -19,7 +20,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $ else NAME = libmlt$(LIBSUF) TARGET = $(NAME).$(version) -@@ -94,10 +96,12 @@ all: $(TARGET) +@@ -96,10 +98,12 @@ all: $(TARGET) $(TARGET): $(OBJS) $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS) @@ -35,7 +36,7 @@ $OpenBSD: patch-src_framework_Makefile,v 1.1.1.1 2014/07/14 09:15:12 zhuk Exp $ depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend -@@ -114,6 +118,8 @@ install: +@@ -116,6 +120,8 @@ install: install -m 755 $(TARGET) $(DESTDIR)$(prefix) ; \ install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt.dll ; \ install -m 644 libmlt.def $(DESTDIR)$(libdir) ; \ diff --git patches/patch-src_framework_mlt_property_h patches/patch-src_framework_mlt_property_h index 02e8d4d10fe..d93fa11d176 100644 --- patches/patch-src_framework_mlt_property_h +++ patches/patch-src_framework_mlt_property_h @@ -3,13 +3,13 @@ $OpenBSD: patch-src_framework_mlt_property_h,v 1.1 2017/05/24 16:30:52 espie Exp Index: src/framework/mlt_property.h --- src/framework/mlt_property.h.orig +++ src/framework/mlt_property.h -@@ -30,8 +30,11 @@ - #include - #endif +@@ -32,8 +32,11 @@ --#if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506) -+#if defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 900506) - #include + #if defined(__GLIBC__) && !defined(__APPLE__) + # include +-#elif defined(__APPLE__) || (__FreeBSD_version >= 900506) ++#elif defined(__APPLE__) || defined(__FreeBSD_version) && (__FreeBSD_version >= 900506) + # include +#elif defined(__OpenBSD__) +/* XXX matches __nop_locale glue in libc++ */ +typedef void* locale_t; diff --git patches/patch-src_modules_plusgpl_consumer_cbrts_c patches/patch-src_modules_plusgpl_consumer_cbrts_c index a457a6ca42f..992c32eff07 100644 --- patches/patch-src_modules_plusgpl_consumer_cbrts_c +++ patches/patch-src_modules_plusgpl_consumer_cbrts_c @@ -1,7 +1,8 @@ $OpenBSD: patch-src_modules_plusgpl_consumer_cbrts_c,v 1.2 2016/04/03 19:15:23 zhuk Exp $ src/modules/plusgpl/consumer_cbrts.c.orig Thu Feb 18 00:43:24 2016 -+++ src/modules/plusgpl/consumer_cbrts.c Mon Feb 29 19:34:22 2016 -@@ -251,6 +251,10 @@ static void load_sections( consumer_cbrts self, mlt_pr +Index:
devel/shellcheck - dependency issue
Makefile has RUN_DEPENDS-lib = ${BUILD_DEPENDS} In the case of USE_CCACHE being set to Yes devel/ccache is added to the build dependencies, when not required at runtime. This shouldn't be used in Makefile's.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: abie...@cvs.openbsd.org 2018/04/20 16:39:57 Modified files: lang/node : Makefile distinfo Log message: Update to the latest. Changelog here: https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V8.md#8.11.1 Go for it. jasper@ :)
emulators/mame - build failure amd64
>From dpb log... Compiling src/devices/bus/iq151/minigraf.cpp... c++ -O2 -pipe -I/usr/local/include -I/usr/X11R6/include -I/usr/local/include/lua-5.3/ -Wno-ignored-qualifiers -MMD -MP -MP -DPTR64=1 -DNDEBUG -DCRLF=2 -DLSB_FIRST -DXMD_H -DFLAC__NO_DLL -DNATIVE_DRC=drcbe_x64 -DLUA_COMPAT_ALL -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2 -I"../../../../../src/osd" -I"../../../../../src/emu" -I"../../../../../src/devices" -I"../../../../../src/mame" -I"../../../../../src/lib" -I"../../../../../src/lib/util" -I"../../../../../3rdparty" -I"../../../../generated/emu" -I"../../../../generated/emu/layout" -I"../../../../../3rdparty/asio/include" -I"../../../../../scripts" -m64 -pipe -O2 -pipe -Wno-unknown-pragmas -Wall -Wcast-align -Wundef -Wformat-security -Wwrite-strings -Wno-sign-compare -Wno-conversion -Wno-error=deprecated-declarations -m64 -x c++ -std=c++14 -Woverloaded-virtual -include ../../../../openbsd/obj/x64/Release/emu.h -o "../../../../openbsd/obj/x64/Release/src/devices/bus/iq151/minigraf.o" -c "../../../../../src/devices/bus/iq151/minigraf.cpp" ../../../../../src/devices/bus/iq151/minigraf.cpp:13:10: fatal error: 'png.h' file not found #include "png.h" ^~~ 1 error generated. gmake[2]: *** [optional.make:13472: ../../../../openbsd/obj/x64/Release/src/devices/bus/iq151/minigraf.o] Error 1 gmake[1]: *** [Makefile:67: optional] Error 2 gmake[1]: Leaving directory '/usr/ports/pobj/mame-0.196/mame0196s/build/projects/sdl/mame/gmake-openbsd' gmake: *** [makefile:1404: openbsd_x64] Error 2 *** Error 2 in emulators/mame (/usr/ports/infrastructure/mk/bsd.port.mk:2741 '/usr/ports/pobj/mame-0.196/.build_done') *** Error 1 in emulators/mame (/usr/ports/infrastructure/mk/bsd.port.mk:2418 'build') ===> Exiting emulators/mame with an error *** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build') Error: job failed with 256 on localhost Build continues if png package is installed, but note that post extract has @sed -i 's|"png.h"|"localpng.h"|' ${WRKSRC}/src/emu/*.cpp \ ${WRKSRC}/src/lib/util/*.cpp ${WRKSRC}/src/tools/*.cpp The source file is not included in the edit. Either png.h needs changing to localpng.h or png package needs to be installed. Also when fixing a revision bump is required.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2018/04/20 14:52:39 Added files: geo/qgis/patches: patch-cmake_FindQCA_cmake patch-cmake_QCAMacros_cmake Log message: Add patch to ensure we include QtCrypto from qca-qt5 even if qca is installed. Should fix a build issue reported by naddy@. While here add another patch to ensure qca-ossl is properly detected during configure.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2018/04/20 14:43:30 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Register ja-groff removal.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2018/04/20 14:40:40 Modified files: japanese : Makefile Removed files: japanese/groff : Makefile distinfo japanese/groff/patches: patch-Makefile_comm patch-Makefile_in patch-afmtodit_Makefile_sub patch-configure patch-devascii_DESC_proto patch-devdvi_DESC_in patch-devlatin1_DESC_proto patch-devlj4_DESC_in patch-devnippon_DESC_proto patch-devnippon_Makefile_sub patch-devps_DESC_in patch-grog_Makefile_sub patch-grog_grog_pl patch-grops_ps_cc patch-hpftodit_hpftodit_cc patch-indxbib_indxbib_cc patch-nroff_nroff_sh patch-refer_refer_cc patch-tmac_doc-common patch-tmac_tmac_e patch-troff_input_cc patch-troff_node_cc patch-xditview_Dvi_c japanese/groff/pkg: DESCR PLIST Log message: Remove japanese/groff. Ancient 1995 software no longer used by anything else. ok jca@ schwarze@
[UPDATE] www/py-mako
Hi, attached is the latest release of Mako. These ports depends on it, so if you used these softwares please test the attached diff to verify that everything works fine: rhythmbox-3.4.2 gobject-introspection-1.54.1 ipython-5.3.0 ipython3-5.3.0 piglit-20180108 deluge-1.3.15 py-pylons-1.0.2 weboob-1.0 Ok? Cheers, Remi. Index: Makefile === RCS file: /cvs/ports/www/py-mako/Makefile,v retrieving revision 1.20 diff -u -p -u -p -r1.20 Makefile --- Makefile 3 Jan 2017 19:28:49 - 1.20 +++ Makefile 20 Apr 2018 19:12:12 - @@ -2,11 +2,9 @@ COMMENT = super-fast templating language -MODPY_EGG_VERSION = 0.9.1 +MODPY_EGG_VERSION = 1.0.7 DISTNAME = Mako-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME:L} - -REVISION = 3 CATEGORIES = www Index: distinfo === RCS file: /cvs/ports/www/py-mako/distinfo,v retrieving revision 1.6 diff -u -p -u -p -r1.6 distinfo --- distinfo 24 Apr 2014 17:41:54 - 1.6 +++ distinfo 20 Apr 2018 19:12:12 - @@ -1,2 +1,2 @@ -SHA256 (Mako-0.9.1.tar.gz) = 7XTXK3IKl6UVkN+oOfIEjO63bMgNHZ6lcxpSYjhDFq4= -SIZE (Mako-0.9.1.tar.gz) = 421071 +SHA256 (Mako-1.0.7.tar.gz) = TgL95XvUq7XsQAGB5MMU9WrD5Juk+4sNULuhjLJ9Ja4= +SIZE (Mako-1.0.7.tar.gz) = 564418 Index: pkg/PLIST === RCS file: /cvs/ports/www/py-mako/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 5 Sep 2013 08:23:35 - 1.4 +++ pkg/PLIST 20 Apr 2018 19:12:12 - @@ -15,6 +15,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}_ast_util.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}ast.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}codegen.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc @@ -30,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/mako/_ast_util.py lib/python${MODPY_VERSION}/site-packages/mako/ast.py lib/python${MODPY_VERSION}/site-packages/mako/cache.py +lib/python${MODPY_VERSION}/site-packages/mako/cmd.py lib/python${MODPY_VERSION}/site-packages/mako/codegen.py lib/python${MODPY_VERSION}/site-packages/mako/compat.py lib/python${MODPY_VERSION}/site-packages/mako/exceptions.py @@ -40,12 +42,16 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}autohandler.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}babelplugin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}beaker_cache.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}linguaplugin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}preprocessors.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}pygmentplugin.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/${MODPY_PYCACHE}turbogears.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/mako/ext/autohandler.py lib/python${MODPY_VERSION}/site-packages/mako/ext/babelplugin.py lib/python${MODPY_VERSION}/site-packages/mako/ext/beaker_cache.py +lib/python${MODPY_VERSION}/site-packages/mako/ext/extract.py +lib/python${MODPY_VERSION}/site-packages/mako/ext/linguaplugin.py lib/python${MODPY_VERSION}/site-packages/mako/ext/preprocessors.py lib/python${MODPY_VERSION}/site-packages/mako/ext/pygmentplugin.py lib/python${MODPY_VERSION}/site-packages/mako/ext/turbogears.py
spyder and py-rope
Hi, I'm trying to port spyder-ide to OpenBSD, and i have some doubts about some things: Question 1: Spyder can be built without docs, to build with docs you need py-sphynx. Should I make a subpackge so we have: +spyder-3.2.6 +spyder-docs-3.26 or just one single package ? I dont see de point in building/installing two packages for a few helper pages, if the package is built in the packages repository its gonna need py-sphynx anyways. also keep in mind that there will be 2 packages: spyder and spyder3 (for python2 and python3 flavors). Question 2: make search key=py-rope Only returns the py-rope package, I guess this means that the package is a dependency to none. The port doesn't have a mantainer, and It doesn't have a flavor for python3 needed for spyder,python3 I will proceed to update it to the latest version. Should I send both to the openbsd-wip on github or just send patches to ports@? Thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/20 12:36:33 Removed files: shells/zsh/patches: patch-Completion_BSD_Command__bsd_pkg patch-Doc_zsh_texi Log message: remove empty files
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2018/04/20 12:22:59 Added files: net/poco/patches: patch-Foundation_src_NumberFormatter_cpp Log message: whitespace fixes for clang6 in code only compiled on ILP32 platforms
armv7: freeradius3 build.
Hello, I've noticed there is a number armv7 packages specified for the 6.3 release on release web page so I assume all ports are already built. Hovewer freeradius 3 seems to be missing from the packages, although it is build on any other architecture I've checked (amd64/sparc64/mips64). I've attempted to buidl myself minimalistic freeradius3 or what I understand would be minimalistic by: # cd /usr/ports/net/freeradius3 # export FLAVOR="no_freetds no_iodbc no_ldap no_memcached no_mysql no_pgsql no_python" # make but this fails with a lot of unresolved symbols like: /usr/local/ports/pobj/freeradius-server-3.0.16-no_freetds-no_iodbc-no_ldap-no_memcached-no_mysql-no_pgsql-no_python/freeradius-server-3.0.16/build/objs/src/modules/rlm_eap/radeapclient.o: In function `main': src/modules/rlm_eap/radeapclient.c:(.text+0x288): undefined reference to `talloc_typed_strdup' src/modules/rlm_eap/radeapclient.c:(.text+0x730): undefined reference to `dict_read' src/modules/rlm_eap/radeapclient.c:(.text+0xbcc): undefined reference to `fr_pair_list_afrom_file' src/modules/rlm_eap/radeapclient.c:(.text+0xc8c): undefined reference to `fr_debug_lvl' src/modules/rlm_eap/radeapclient.c:(.text+0xcf0): undefined reference to `fr_debug_lvl' src/modules/rlm_eap/radeapclient.c:(.text+0x1614): undefined reference to `fr_debug_lvl' src/modules/rlm_eap/radeapclient.c:(.text+0x1634): undefined reference to `fr_debug_lvl' src/modules/rlm_eap/radeapclient.c:(.text+0x1648): undefined reference to `fr_debug_lvl' src/modules/rlm_eap/radeapclient.c:(.text+0x1690): undefined reference to `fr_pair_find_by_num' src/modules/rlm_eap/radeapclient.c:(.text+0x16a8): undefined reference to `fr_pair_find_by_num' src/modules/rlm_eap/radeapclient.c:(.text+0x16c4): undefined reference to `fr_pair_find_by_num' src/modules/rlm_eap/radeapclient.c:(.text+0x18d8): undefined reference to `fr_pair_delete_by_num' src/modules/rlm_eap/radeapclient.c:(.text+0x18ec): undefined reference to `fr_pair_delete_by_num' src/modules/rlm_eap/radeapclient.c:(.text+0x1900): undefined reference to `fr_pair_delete_by_num' when I tried opposite end and unset FLAVOR to build maximum build, I've been hit by the failure in gcc-4.9.4 build which shows as: In file included from /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/c/c-objc-common.c:33: In file included from /usr/include/c++/v1/new:70: /usr/include/c++/v1/exception:267:5: error: no member named 'fancy_abort' in namespace 'std::__1'; did you mean simply 'fancy_abort'? _VSTD::abort(); ^~~ /usr/include/c++/v1/__config:462:15: note: expanded from macro '_VSTD' #define _VSTD std::_LIBCPP_NAMESPACE ^ /usr/ports/pobj/gcc-4.9.4/gcc-4.9.4/gcc/system.h:685:13: note: 'fancy_abort' declared here extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN; ^ 1 error generated. gmake[3]: *** [Makefile:1058: c/c-objc-common.o] Error 1 gmake[3]: Leaving directory '/usr/local/ports/pobj/gcc-4.9.4/build-arm/gcc' gmake[2]: *** [Makefile:4217: all-stage1-gcc] Error 2 gmake[2]: Leaving directory '/usr/local/ports/pobj/gcc-4.9.4/build-arm' gmake[1]: *** [Makefile:17735: stage1-bubble] Error 2 gmake[1]: Leaving directory '/usr/local/ports/pobj/gcc-4.9.4/build-arm' gmake: *** [Makefile:17872: bootstrap2] Error 2 I guess, no way to make freeradius3 on armv7, but still I'd like to ask for confirmation of this fact. Thanks! Karel
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2018/04/20 11:41:59 Modified files: net/mosquitto : Makefile distinfo net/mosquitto/patches: patch-src_mosquitto_passwd_c patch-src_security_default_c Removed files: net/mosquitto/patches: patch-test_broker_Makefile Log message: - update to mosquitto-1.4.15 - take maintainership ok edd@ (previous MAINTAINER)
Re: clang6 fallout
Updated list as of Apr 20, 15:00 UTC. http://build-failures.rhaalovely.net/amd64/2018-04-19/ cad/kicad graphics/aqsis multimedia/k3b-kde4 multimedia/mlt x11/kde/base3 x11/kde/games3 x11/kde4/bovo x11/kde4/kopete x11/kde4/kross-interpreters x11/kde4/kuser x11/kde4/p5-qt x11/kde4/pim-runtime x11/kde4/py-kde x11/kde4/rocs x11/kde4/ruby-qt x11/kde4/superkaramba I think all important ports build now. Let's mop up the rest! -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2018/04/20 09:06:22 Modified files: emulators/mame : Makefile Log message: Enable build on i386, as it builds and runs fine. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2018/04/20 08:40:40 Modified files: net/lua-mmdb : Makefile distinfo Log message: Update lua-mmdb to 0.2 and add missing TEST_DEPENDS.
Re: Clang 6 fixes for games/stepmania
On Wed, Apr 18, 2018 at 09:51:43PM +0200, Christian Weisgerber wrote: > Frederic Cambus: > > > Here is a diff to fix stepmania build with Clang 6 (handpicked from > > upstream commits). > > There's a problem with applying the patch because src/ProfileManager.cpp > has CR LF line endings. Commited the diff with an added post-extract target to fix line endings, thanks for pointing this out.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2018/04/20 06:40:09 Modified files: games/stepmania: Makefile Added files: games/stepmania/patches: patch-src_PrefsManager_cpp patch-src_ProfileManager_cpp Log message: Fix build with Clang 6, handpicked from upstream commits. OK schwarze@, jasper@
Re: clang 6: php 5.6 broken with opcache
On 2018/04/20 12:59, Stuart Henderson wrote: > Does anyone have an idea what might be going on? In the absence of > anything better I'm currently trying to figure out how to compile > various files with a different compiler to try to narrow things down > to a particular file. ..building the parts in ext/opcache with base gcc doesn't help.
clang 6: php 5.6 broken with opcache
php 5.6 built with clang 6 segfaults at runtime if opcache is used (same with the in-tree version and a locally-built update to 5.6.35). Packages built with old clang do work ok on the same kernel that the new ones fail with. Seems okay if opcache is not enabled. Seems okay in 7.0. Does anyone have an idea what might be going on? In the absence of anything better I'm currently trying to figure out how to compile various files with a different compiler to try to narrow things down to a particular file. Example backtrace: (gdb) bt #0 0x0d96cb832f53 in zend_block_optimization (op_array=Variable "op_array" is not available. ) at block_pass.c:1902 #1 0x0d96cb830a8a in zend_optimize (op_array=Variable "op_array" is not available. ) at pass5.c:2 #2 0x0d96cb82dad2 in zend_accel_optimize (op_array=0xd9664740a38, script=Variable "script" is not available. ) at /usr/obj/ports/php-5.6.35/php-5.6.35/ext/opcache/Optimizer/zend_optimizer.c:586 #3 0x0d96cb82d897 in zend_accel_script_optimize (script=0xd9664740a20) at /usr/obj/ports/php-5.6.35/php-5.6.35/ext/opcache/Optimizer/zend_optimizer.c:633 #4 0x0d96cb821d7b in compile_and_cache_file (file_handle=Variable "file_handle" is not available. ) at ZendAccelerator.c:1165 #5 0x0d96cb821674 in persistent_compile_file ( file_handle=0x7f7dcf48, type=8) at ZendAccelerator.c:1680 #6 0x0d943a70c10e in zend_execute_scripts (type=8, retval=0x0, file_count=3) at zend.c:1333 #7 0x0d943a6a9b36 in php_execute_script (primary_file=Variable "primary_file" is not available. ) at main.c:2613 #8 0x0d943a79c0fd in do_cli (argc=Variable "argc" is not available. ) at php_cli.c:999 #9 0x0d943a79b03f in main (argc=2, argv=0x7f7dd588) at php_cli.c:1383 Tail of kdump: 42144 php-5.6 CALL lseek(4,0,SEEK_CUR) 42144 php-5.6 RET lseek 5766/0x1686 42144 php-5.6 CALL fcntl(4,F_ISATTY) 42144 php-5.6 RET fcntl -1 errno 25 Inappropriate ioctl for device 42144 php-5.6 CALL fstat(4,0x7f7d0070) 42144 php-5.6 STRU struct stat { dev=1037, ino=947378, mode=-rwxr-xr-x , nlink=1, uid=0<"root">, gid=7<"bin">, rdev=3812237, atime=1524224156<"Apr 20 12:35:56 2018">.361714097, mtime=1524095986<"Apr 19 00:59:46 2018">, ctime=1524217255<"Apr 20 10:40:55 2018">.710145907, size=5766, blocks=16, blksize=32768, flags=0x0, gen=0x0 } 42144 php-5.6 RET fstat 0 42144 php-5.6 CALL mmap(0,0x16a6,0x1,0x2,4,0) 42144 php-5.6 RET mmap 33848217530368/0x1ec8e6fb7000 42144 php-5.6 CALL mmap(0,0x4,0x3,0x1002 ,-1,0) 42144 php-5.6 RET mmap 33850099900416/0x1ec9572e2000 42144 php-5.6 CALL kbind(0x7f7d02a0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d02c0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d02c0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d02c0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d02c0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d0130,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d0130,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d00a0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7d0130,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7cfba0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 CALL kbind(0x7f7cfba0,24,0xc153e7a574fb2071) 42144 php-5.6 RET kbind 0 42144 php-5.6 PSIG SIGSEGV SIG_DFL code SEGV_MAPERR<1> addr=0x1ec9e4bb60ed trapno=6 42144 php-5.6 NAMI "php-5.6.core"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2018/04/20 05:48:37 Modified files: games/alephone/alephone: Makefile Added files: games/alephone/alephone/patches: patch-Source_Files_Misc_sdl_dialogs_cpp patch-Source_Files_Misc_sdl_widgets_cpp patch-Source_Files_Misc_sdl_widgets_h patch-Source_Files_Network_Metaserver_SdlMetaserverClientUi_cpp patch-Source_Files_Network_network_dialogs_cpp Log message: fix with clang6; OK phessler (MAINTAINER)
NEW: net/blaeu
Blaeu is a set of programs to create distributed Internet measurements on the network of RIPE Atlas probes. https://framagit.org/bortzmeyer/blaeu Denis blaeu-1.1.1.tgz Description: application/tar-gz
Re: i386 clang6 breakage
On 2018/04/20 13:02, Christian Weisgerber wrote: > Stuart Henderson: > > > Report from the end of my most recent build, I've picked up most fixes > > and retried but there's a chance I may have missed one: > > > > devel/avr/gcc > > What was the problem there? It built fine for me on i386. > > -- > Christian "naddy" Weisgerber na...@mips.inka.de > It built this time; problem before was: cc -c -DHAVE_CONFIG_H -I/usr/local/include -fgnu89-inline -I. -I/usr/obj/ports/avr-gcc-4.3.4/gcc-4.3.4/libiberty/../in clude -W -Wall -Wwrite-strings -Wc++-compat -Wstrict-prototypes -pedantic /usr/obj/ports/avr-gcc-4.3.4/gcc-4.3.4/lib iberty/cp-demangle.c -o cp-demangle.o In file included from /usr/obj/ports/avr-gcc-4.3.4/gcc-4.3.4/libiberty/cp-demangle.c:127: /usr/obj/ports/avr-gcc-4.3.4/gcc-4.3.4/libiberty/../include/libiberty.h:87:23: error: expected ';' after top level dec larator extern void expandargv PARAMS ((int *, char ***)); ^ ; /usr/obj/ports/avr-gcc-4.3.4/gcc-4.3.4/libiberty/../include/libiberty.h:91:21: error: expected ';' after top level dec larator extern int writeargv PARAMS ((char **, FILE *)); ^ ; 2 errors generated. gmake[2]: Leaving directory '/usr/obj/ports/avr-gcc-4.3.4/build-i386/libiberty' gmake[1]: Leaving directory '/usr/obj/ports/avr-gcc-4.3.4/build-i386' No change in build log between good+bad attempts up to the point of failure.
Re: i386 clang6 breakage
Stuart Henderson: > Report from the end of my most recent build, I've picked up most fixes > and retried but there's a chance I may have missed one: > > devel/avr/gcc What was the problem there? It built fine for me on i386. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2018/04/20 04:23:07 Modified files: security/kc: Makefile distinfo security/kc/pkg: PLIST Log message: update to kc-2.4.2, from maintainer/upstream LÃVAI Dániel Note: the storage format has changed, dump to xml before updating: $ kc -k ~/.kc/default.kcd Password:dump kcdump Dump OK quit Then follow instructions in /usr/local/share/doc/kc/Changelog. There is an @ask-update question during update giving users chance to do this.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2018/04/20 04:00:20 Modified files: devel/libgsf : Makefile distinfo Log message: Update to libgsf-1.14.43.
Re: clang 6 deregister games/alephone/alephone
On 2018 Apr 20 (Fri) at 02:55:16 +0200 (+0200), Ingo Schwarze wrote: :Hi, : :Christian Weisgerber wrote on Wed, Apr 18, 2018 at 01:18:22PM +0200: :> Peter Hessler: : :>> This patch set removes the "register" keyword, which is no longer :>> legal to use. : :> Why bother? It doesn't cause errors, just warnings. :> Instead of patches, I would suggest defining it away by adding :> -Dregister= to CXXFLAGS. : :My impression is that -Wno-deprecated-register might be even safer :because it doesn't blindly change the code but just hide the :warnings. : :The following patch fixes the problems that must be fixed to build :with clang6. They are all related to the well-known clang6 effect :that NULL cannot be assigned to certain pointer types, in this :case function pointers. : :The flag -Wno-c++11-narrowing is *really* required. There are :many dozen, maybe hundreds of violations scattered all over the :place. I suspect that some of them may actually be overflow bugs :and result in rendering errors (or worse), but auditing for that :is really a task for upstream, not for us (unless the MAINTAINER :is extremely bored :). : :No, i'm not gonna get addicted to this game. Testing it feels like :brutal work. It runs for me, and so do i. But we want to get the :tree back in shape, right? : :OK? : Ingo : It builds, it runs. OK : :Index: Makefile :=== :RCS file: /cvs/ports/games/alephone/alephone/Makefile,v :retrieving revision 1.23 :diff -u -p -r1.23 Makefile :--- Makefile 26 Jul 2017 22:45:20 - 1.23 :+++ Makefile 20 Apr 2018 00:46:12 - :@@ -6,7 +6,7 @@ COMMENT = open source game engine based : DATE =20150620 : DISTNAME =AlephOne-${DATE} : PKGNAME = alephone-1.2.1 :-REVISION =0 :+REVISION =1 : : EXTRACT_SUFX =.tar.bz2 : CATEGORIES = games x11 :@@ -48,5 +48,10 @@ AUTOMAKE_VER = 1.9 : CONFIGURE_ENV = AUTOCONF_VERSION=${AUTOCONF_VER} \ : AUTOMAKE_VERSION=${AUTOMAKE_VER} \ : CPPFLAGS=-I${LOCALBASE}/include :+ :+.include :+.if ${PROPERTIES:Mclang} :+CXXFLAGS += -Wno-c++11-narrowing -Wno-deprecated-register :+.endif : : .include :Index: patches/patch-Source_Files_Misc_sdl_dialogs_cpp :=== :RCS file: patches/patch-Source_Files_Misc_sdl_dialogs_cpp :diff -N patches/patch-Source_Files_Misc_sdl_dialogs_cpp :--- /dev/null 1 Jan 1970 00:00:00 - :+++ patches/patch-Source_Files_Misc_sdl_dialogs_cpp20 Apr 2018 00:46:12 - :@@ -0,0 +1,14 @@ :+$OpenBSD$ :+ :+Index: Source_Files/Misc/sdl_dialogs.cpp :+--- Source_Files/Misc/sdl_dialogs.cpp.orig : Source_Files/Misc/sdl_dialogs.cpp :+@@ -2018,7 +2018,7 @@ void tab_placer::visible(bool visible) :+ :+ dialog::dialog() : active_widget(NULL), mouse_widget(0), active_widget_num(UNONE), done(false), :+ cursor_was_visible(false), parent_dialog(NULL), :+-processing_function(NULL), placer(0), last_redraw(0) :++processing_function(0), placer(0), last_redraw(0) :+ { :+ } :+ :Index: patches/patch-Source_Files_Misc_sdl_widgets_cpp :=== :RCS file: patches/patch-Source_Files_Misc_sdl_widgets_cpp :diff -N patches/patch-Source_Files_Misc_sdl_widgets_cpp :--- /dev/null 1 Jan 1970 00:00:00 - :+++ patches/patch-Source_Files_Misc_sdl_widgets_cpp20 Apr 2018 00:46:12 - :@@ -0,0 +1,32 @@ :+$OpenBSD$ :+ :+Index: Source_Files/Misc/sdl_widgets.cpp :+--- Source_Files/Misc/sdl_widgets.cpp.orig : Source_Files/Misc/sdl_widgets.cpp :+@@ -719,7 +719,7 @@ void w_select_button::place(const SDL_Rect , placeme :+ :+ static const char* sNoValidOptionsString = "(no valid options)"; // XXX should be moved outside compiled code e.g. to MML :+ :+-w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET), labels(l), we_own_labels(false), selection(s), selection_changed_callback(NULL), utf8(false) :++w_select::w_select(size_t s, const char **l) : widget(LABEL_WIDGET), labels(l), we_own_labels(false), selection(s), selection_changed_callback(0), utf8(false) :+ { :+ num_labels = 0; :+ if(labels) { :+@@ -1113,7 +1113,7 @@ void w_color_picker::draw(SDL_Surface *s) const :+ */ :+ :+ w_text_entry::w_text_entry(size_t max_c, const char *initial_text) :+- : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(NULL), value_changed_callback(NULL), max_chars(max_c), enable_mac_roman(false) :++ : widget(TEXT_ENTRY_WIDGET), enter_pressed_callback(0), value_changed_callback(0), max_chars(max_c), enable_mac_roman(false) :+ { :+ // Initialize buffer :+ buf = new char[max_chars + 1]; :+@@ -2115,7 +2115,7 @@ void w_select_popup::gotSelected () :+ static const char* const sFileChooserInvalidFileString = "(no valid
Re: UPDATE: security/kc
Stuart Henderson @ 2018-04-19T23:04:02 +0200: Thanks, Stuart, > On 2018/04/18 18:10, LÉVAI Dániel wrote: > > Hi! > > > > Update to kc, that breaks compatibility with <2.4 kc databases. > > Please check how I handled it here, I tried to mimic postgresql's way > > with @ask-update. [...] > Since you're upstream would you mind uploading a tar.gz as a > "release asset" and switching to that please? There's a drag-and-drop > or file selection box on the releases page (or there are some gists > floating around if you want to automate it). > > That way we aren't at risk of broken auto-generated distfiles > when github update their software stack. > > Ports-wise that involves traditional DISTNAME and MASTER_SITES lines > instead of GH_*. I uploaded a new archive (repackaged Github's release tar.gz as tar.bz2) and I point to that from the Makefile. Is this what you had in mind? [...] > > +FLAVORS = scrypt > > +FLAVOR ?= > > + > > +.if ${FLAVOR:Mscrypt} > > +LIB_DEPENDS += security/libscrypt > > +MAKE_ENV +=HAVE_LIBSCRYPT=yes > > +.endif > > + > > It's only a small dep, is there a real advantage to making it optional? There's no real reason for the FLAVOR other than I didn't want to impose this on everyone. But you're right, it's a small dep., if it's okay, I just removed the flavor. Attached the amended diff (also removed the patch because I've incorporated it in the new release while there). Daniel Index: Makefile === RCS file: /cvs/ports/security/kc/Makefile,v retrieving revision 1.14 diff -u -p -p -u -r1.14 Makefile --- Makefile29 Dec 2015 19:49:41 - 1.14 +++ Makefile20 Apr 2018 08:52:07 - @@ -2,29 +2,33 @@ COMMENT = console based password storing application -GH_ACCOUNT = levaidaniel -GH_PROJECT = kc -GH_TAGNAME = 2.3.2 -REVISION = 1 +V =2.4.2 +DISTNAME = kc-$V +EXTRACT_SUFX = .tar.bz2 +MASTER_SITES = https://github.com/levaidaniel/kc/releases/download/${V}/ CATEGORIES = security -HOMEPAGE = http://github.com/levaidaniel/${GH_PROJECT} +HOMEPAGE = http://github.com/levaidaniel/kc/ MAINTAINER = LEVAI Daniel# BSD PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c crypto edit ncursesw pcre pthread xml2 +WANTLIB += c crypto edit ncursesw pcre pthread xml2 scrypt LIB_DEPENDS = textproc/libxml \ - devel/pcre + devel/pcre \ + security/libscrypt + +MAKE_ENV +=HAVE_PCRE=yes OS_OPENBSD=yes HAVE_LIBSCRYPT=yes -MAKE_ENV +=HAVE_PCRE=yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kc ${INSTALL} ${WRKBUILD}/pwsafe_to_kc.pl ${PREFIX}/share/kc/ + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kc + ${INSTALL} ${WRKBUILD}/Changelog ${PREFIX}/share/doc/kc/ .include Index: distinfo === RCS file: /cvs/ports/security/kc/distinfo,v retrieving revision 1.5 diff -u -p -p -u -r1.5 distinfo --- distinfo24 Dec 2013 12:56:19 - 1.5 +++ distinfo20 Apr 2018 08:52:07 - @@ -1,2 +1,2 @@ -SHA256 (kc-2.3.2.tar.gz) = 1Ap74wB55M/EI+GqK127Dm8LNInx0OCQzWZyi8Mo/Ng= -SIZE (kc-2.3.2.tar.gz) = 44779 +SHA256 (kc-2.4.2.tar.bz2) = PpFoQR8OHwOQE8OwsSXolGt7D+fpLRVvBpyMu0ovimE= +SIZE (kc-2.4.2.tar.bz2) = 65011 Index: pkg/PLIST === RCS file: /cvs/ports/security/kc/pkg/PLIST,v retrieving revision 1.3 diff -u -p -p -u -r1.3 PLIST --- pkg/PLIST 21 Mar 2013 09:48:45 - 1.3 +++ pkg/PLIST 20 Apr 2018 08:52:07 - @@ -1,6 +1,9 @@ @comment $OpenBSD: PLIST,v 1.3 2013/03/21 09:48:45 jasper Exp $ +@ask-update kc-<2.4 Make sure all your existing kc databases are safely *dumped* ('dump' command) then read the Changelog in ${PREFIX}/share/doc/kc after installation @bin bin/kc @man man/man1/kc.1 +share/doc/kc/ +share/doc/kc/Changelog share/doc/pkg-readmes/${FULLPKGNAME} share/kc/ share/kc/pwsafe_to_kc.pl -- LÉVAI Dániel PGP key ID = 0x83B63A8F Key fingerprint = DBEC C66B A47A DFA2 792D 650C C69B BE4C 83B6 3A8F
Re: UPDATE net/unison
On 04/19/18 11:41, Klemens Nanni wrote: > On Tue, Apr 03, 2018 at 08:28:12PM +0200, Björn Ketelaars wrote: >> unison received an update to 2.51.2. An overview on what has changed can >> be found at https://github.com/bcpierce00/unison/releases. Noticeable is >> that this version breaks compatibility with older versions. >> >> Tested OK on amd64, and make test runs successfully. >> >> Response MAINTAINER: 'fine, ok giovanni@'. >> >> Additional comments/OKs? > Sorry for the long delay, looks OK port- and build-wise on amd64. > Two things: > >> HOMEPAGE= http://www.cis.upenn.edu/~bcpierce/unison/ > This site has TLS. > >> # Avoid the nightmare of their Makefile install target. >> # Do not use INSTALL_PROGRAM, as the bytecode version must not be stripped! > Just unset INSTALL_STRIP and use INSTALL_PROGRAM as normal, that way > intentions are clear without this comment. > I would prefer to use INSTALL_STRIP but with the comment to remember why we do not strip binaries in this case. Otherwise ok. Giovanni