Re: [UPDATE] audio/openal
Works for me thanks.
On 28 December 2017 at 03:54, Jeremie Courreges-Anglas
wrote:
>
> On Sun, Dec 24 2017, David CARLIER wrote:
> > On 24 December 2017 at 00:25, Jeremie Courreges-Anglas
> > wrote:
> >
> >> On Sat, Dec 23 2017, David CARLIER wrote:
> >> > Hi,
> >> >
> >> > Due to lot of gaming porting efforts these days :-),
> >> > here a little diff for openal just a fix to avoid probing non existent
> >> > capture handling (in the sndio backend).
> >>
> >> Could you please describe in more details the problem and why you chose
> >> to fix it this way? I don't know much about OpenAL, but it's not
> >> obvious to me why you're modifying what looks like backend-agnostic code
> >> to fix a problem in sndio support.
>
> > Sure. In fact our sndio backend does not have capture handling thus
> > trying to probe it in this case would cause a segfault in case a software
> > would require it.
> > Noted by thrfw while porting fs2open recently.
>
> OK so it turns out this is easily reachable from openal-info. egdb
> backtrace with DEBUG='-g -O0':
>
> --8<--
> Reading symbols from openal-info...done.
> (gdb) r
> Starting program: /usr/local/bin/openal-info
> Available playback devices:
> SndIO Default
> Available capture devices:
>
> Program received signal SIGSEGV, Segmentation fault.
> 0x in ?? ()
> (gdb) bt
> #0 0x in ?? ()
> #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0
> , backendinfo=0x1f9f91b0338 ,
> type=CAPTURE_DEVICE_PROBE)
> at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234
> #2 0x01f9f8f4948c in ProbeCaptureDeviceList () at
> /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1246
> #3 0x01f9f8f491e5 in alcGetString (Device=0x0, param=784) at
> /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:2617
> #4 0x01f6fae0078b in main (argc=1, argv=0x7f7e1a08) at
> /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/utils/openal-info.c:299
> (gdb) frame 1
> #1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0
> , backendinfo=0x1f9f91b0338 ,
> type=CAPTURE_DEVICE_PROBE)
> at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234
> 1234backendinfo->Probe(type);
> (gdb) p backendinfo
> $2 = (struct BackendInfo *) 0x1f9f91b0338
> (gdb) p *backendinfo
> $3 = {name = 0x0, getFactory = 0x0, Init = 0x0, Deinit = 0x0, Probe = 0x0,
> Funcs = {OpenPlayback = 0x0, ClosePlayback = 0x0, ResetPlayback = 0x0,
> StartPlayback = 0x0, StopPlayback = 0x0, OpenCapture = 0x0,
> CloseCapture = 0x0, StartCapture = 0x0, StopCapture = 0x0,
> CaptureSamples = 0x0, AvailableSamples = 0x0}}
> (gdb)
> -->8--
>
> Indeed the CaptureBackend is not initialized and obviously shouldn't be
> used, but your diff disables all probing:
>
> ritchie /usr/ports/audio/openal$ openal-info
> Available playback devices:
> !!! none !!!
> Available capture devices:
> !!! none !!!
> Default playback device:
> Default capture device:
> ALC version: 1.1
> [...]
>
> Upstream has already fixed this issue:
>
> https://github.com/kcat/openal-soft/commit/
> d1e98c36d375433cb11a7a74ce20c968491773aa
>
> ritchie /usr/ports/audio/openal$ openal-info
> Available playback devices:
> SndIO Default
> Available capture devices:
> !!! none !!!
> Default playback device: SndIO Default
> Default capture device:
> ALC version: 1.1
> [...]
>
> I have only tested openal-info. Does the diff below work for you?
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/openal/Makefile,v
> retrieving revision 1.49
> diff -u -p -r1.49 Makefile
> --- Makefile15 Nov 2017 13:02:42 - 1.49
> +++ Makefile28 Dec 2017 03:43:49 -
> @@ -10,6 +10,7 @@ DISTNAME =openal-soft-$V
> PKGNAME = openal-$V
> CATEGORIES = audio
> SHARED_LIBS = openal 3.0
> +REVISION = 0
>
> HOMEPAGE = http://kcat.strangesoft.net/openal.html
>
> Index: patches/patch-Alc_ALc_c
> ===
> RCS file: patches/patch-Alc_ALc_c
> diff -N patches/patch-Alc_ALc_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Alc_ALc_c 28 Dec 2017 03:43:49 -
> @@ -0,0 +1,35 @@
> +$OpenBSD$
> +
> +commit d1e98c36d375433cb11a7a74ce20c968491773aa
> +Author: Chris Robinson
> +Date: Sat Apr 30 17:14:55 2016 -0700
> +
> +Don't crash when there's no backend to probe
> +
> +Index: Alc/ALc.c
> +--- Alc/ALc.c.orig
> Alc/ALc.c
> +@@ -1117,6 +1117,11 @@ static void alc_initconfig(void)
> + V0(factory,init)();
> + }
> +
> ++if(!PlaybackBackend.name)
> ++WARN("No playback backend available!\n");
> ++if(!CaptureBackend.name)
> ++WARN("No capture backend available!\n");
> ++
> + if(ConfigValueStr(NULL, NULL, "excludefx", &str))
> + {
> + size_t len;
> +@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct
> Backe
>
UPDATE: devel/qt-creator
Hi All!
Here is the last one in the Qt chain. Simple diff to the latest stable
version. Works fine here on amd64.
Ok? Comments?
Best regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/devel/qt-creator/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile16 Nov 2017 23:20:38 - 1.31
+++ Makefile28 Dec 2017 06:15:27 -
@@ -4,7 +4,7 @@
USE_WXNEEDED = Yes
COMMENT = cross-platform IDE for use with Qt
-V =4.4.1
+V =4.5.0
DISTNAME = qt-creator-opensource-src-${V}
PKGNAME = qt-creator-${V}
@@ -13,16 +13,16 @@ SHARED_LIBS += CPlusPlus
SHARED_LIBS += ExtensionSystem 3.0 # 0.0
SHARED_LIBS += GLSL 0.0 # 0.0
SHARED_LIBS += LanguageUtils 0.0 # 0.0
-SHARED_LIBS += QmlDebug 2.0 # 0.0
+SHARED_LIBS += QmlDebug 3.0 # 0.0
SHARED_LIBS += QmlEditorWidgets 0.0 # 0.0
-SHARED_LIBS += QmlJS 3.0 # 0.0
+SHARED_LIBS += QmlJS 4.0 # 0.0
SHARED_LIBS += QtcSsh0.0 # 0.0
-SHARED_LIBS += Utils 3.0 # 0.0
-SHARED_LIBS += Clangbackendipc 2.1 # 1.0
-SHARED_LIBS += Sqlite2.1 # 1.0
-SHARED_LIBS += Timeline 2.1 # 1.0
-SHARED_LIBS += Modeling 2.0 # 1.0
+SHARED_LIBS += Utils 4.0 # 0.0
+SHARED_LIBS += Sqlite3.0 # 1.0
+SHARED_LIBS += Timeline 3.0 # 1.0
+SHARED_LIBS += Modeling 3.0 # 1.0
SHARED_LIBS += FlameGraph0.0 # 4.2
+SHARED_LIBS += Clangsupport 0.0 # 4.5
MAKE_FLAGS = BUILD_TESTS=1
.for _l _v in ${SHARED_LIBS}
Index: distinfo
===
RCS file: /cvs/ports/devel/qt-creator/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo21 Oct 2017 20:04:15 - 1.8
+++ distinfo28 Dec 2017 06:15:27 -
@@ -1,2 +1,2 @@
-SHA256 (qt-creator-opensource-src-4.4.1.tar.gz) =
6Wx8jQ1oO/D8BAXU7RIkxCbOgTUwIVatT5DiHEa1dGU=
-SIZE (qt-creator-opensource-src-4.4.1.tar.gz) = 27604133
+SHA256 (qt-creator-opensource-src-4.5.0.tar.gz) =
EpLpGhjNHwbin2mNUKcyo36Pb3Sxu+IZnJT3RGw3/Ug=
+SIZE (qt-creator-opensource-src-4.5.0.tar.gz) = 28484707
Index: patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp
===
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_plugins_projectexplorer_gcctoolchain_cpp
--- patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 21 Oct 2017
20:04:15 - 1.4
+++ patches/patch-src_plugins_projectexplorer_gcctoolchain_cpp 28 Dec 2017
06:15:27 -
@@ -5,7 +5,7 @@ Append eg++ before g++ so eg++ is used b
Index: src/plugins/projectexplorer/gcctoolchain.cpp
--- src/plugins/projectexplorer/gcctoolchain.cpp.orig
+++ src/plugins/projectexplorer/gcctoolchain.cpp
-@@ -735,7 +735,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
+@@ -707,7 +707,7 @@ FileNameList GccToolChain::suggestedMkspecList() const
QString GccToolChain::makeCommand(const Environment &environment) const
{
Index: patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
===
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp,v
retrieving revision 1.3
diff -u -p -u -p -r1.3
patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
--- patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
14 Jun 2017 17:11:20 - 1.3
+++ patches/patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp
28 Dec 2017 06:15:27 -
@@ -7,7 +7,7 @@ compile C++11 code.
Index: src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
--- src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp.orig
+++ src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
-@@ -677,6 +677,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
+@@ -679,6 +679,7 @@ void QmakeBuildConfigurationFactory::configureBuildCon
buildSteps->insertStep(0, qmakeStep);
MakeStep *makeStep = new MakeStep(buildSteps);
Index: patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
===
RCS file:
/cvs/ports/devel/qt-creator/patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_shared_qbs_src_lib_corelib_tools_tools_pri
--- patches/patch-src_shared_qbs_src_lib_corelib_tools_tools_pri21 Sep
2017 19:10:37 - 1.4
+++
Re: [UPDATE] audio/openal
On Sun, Dec 24 2017, David CARLIER wrote:
> On 24 December 2017 at 00:25, Jeremie Courreges-Anglas
> wrote:
>
>> On Sat, Dec 23 2017, David CARLIER wrote:
>> > Hi,
>> >
>> > Due to lot of gaming porting efforts these days :-),
>> > here a little diff for openal just a fix to avoid probing non existent
>> > capture handling (in the sndio backend).
>>
>> Could you please describe in more details the problem and why you chose
>> to fix it this way? I don't know much about OpenAL, but it's not
>> obvious to me why you're modifying what looks like backend-agnostic code
>> to fix a problem in sndio support.
> Sure. In fact our sndio backend does not have capture handling thus
> trying to probe it in this case would cause a segfault in case a software
> would require it.
> Noted by thrfw while porting fs2open recently.
OK so it turns out this is easily reachable from openal-info. egdb
backtrace with DEBUG='-g -O0':
--8<--
Reading symbols from openal-info...done.
(gdb) r
Starting program: /usr/local/bin/openal-info
Available playback devices:
SndIO Default
Available capture devices:
Program received signal SIGSEGV, Segmentation fault.
0x in ?? ()
(gdb) bt
#0 0x in ?? ()
#1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0
, backendinfo=0x1f9f91b0338 ,
type=CAPTURE_DEVICE_PROBE)
at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234
#2 0x01f9f8f4948c in ProbeCaptureDeviceList () at
/usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1246
#3 0x01f9f8f491e5 in alcGetString (Device=0x0, param=784) at
/usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:2617
#4 0x01f6fae0078b in main (argc=1, argv=0x7f7e1a08) at
/usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/utils/openal-info.c:299
(gdb) frame 1
#1 0x01f9f8f51096 in ProbeDevices (list=0x1f9f91b02a0
, backendinfo=0x1f9f91b0338 ,
type=CAPTURE_DEVICE_PROBE)
at /usr/ports/pobj/openal-1.17.2/openal-soft-1.17.2/Alc/ALc.c:1234
1234backendinfo->Probe(type);
(gdb) p backendinfo
$2 = (struct BackendInfo *) 0x1f9f91b0338
(gdb) p *backendinfo
$3 = {name = 0x0, getFactory = 0x0, Init = 0x0, Deinit = 0x0, Probe = 0x0,
Funcs = {OpenPlayback = 0x0, ClosePlayback = 0x0, ResetPlayback = 0x0,
StartPlayback = 0x0, StopPlayback = 0x0, OpenCapture = 0x0,
CloseCapture = 0x0, StartCapture = 0x0, StopCapture = 0x0, CaptureSamples =
0x0, AvailableSamples = 0x0}}
(gdb)
-->8--
Indeed the CaptureBackend is not initialized and obviously shouldn't be
used, but your diff disables all probing:
ritchie /usr/ports/audio/openal$ openal-info
Available playback devices:
!!! none !!!
Available capture devices:
!!! none !!!
Default playback device:
Default capture device:
ALC version: 1.1
[...]
Upstream has already fixed this issue:
https://github.com/kcat/openal-soft/commit/d1e98c36d375433cb11a7a74ce20c968491773aa
ritchie /usr/ports/audio/openal$ openal-info
Available playback devices:
SndIO Default
Available capture devices:
!!! none !!!
Default playback device: SndIO Default
Default capture device:
ALC version: 1.1
[...]
I have only tested openal-info. Does the diff below work for you?
Index: Makefile
===
RCS file: /cvs/ports/audio/openal/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile15 Nov 2017 13:02:42 - 1.49
+++ Makefile28 Dec 2017 03:43:49 -
@@ -10,6 +10,7 @@ DISTNAME =openal-soft-$V
PKGNAME = openal-$V
CATEGORIES = audio
SHARED_LIBS = openal 3.0
+REVISION = 0
HOMEPAGE = http://kcat.strangesoft.net/openal.html
Index: patches/patch-Alc_ALc_c
===
RCS file: patches/patch-Alc_ALc_c
diff -N patches/patch-Alc_ALc_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Alc_ALc_c 28 Dec 2017 03:43:49 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+commit d1e98c36d375433cb11a7a74ce20c968491773aa
+Author: Chris Robinson
+Date: Sat Apr 30 17:14:55 2016 -0700
+
+Don't crash when there's no backend to probe
+
+Index: Alc/ALc.c
+--- Alc/ALc.c.orig
Alc/ALc.c
+@@ -1117,6 +1117,11 @@ static void alc_initconfig(void)
+ V0(factory,init)();
+ }
+
++if(!PlaybackBackend.name)
++WARN("No playback backend available!\n");
++if(!CaptureBackend.name)
++WARN("No capture backend available!\n");
++
+ if(ConfigValueStr(NULL, NULL, "excludefx", &str))
+ {
+ size_t len;
+@@ -1230,9 +1235,9 @@ static void ProbeDevices(al_string *list, struct Backe
+ LockLists();
+ al_string_clear(list);
+
+-if(!backendinfo->getFactory)
++if(backendinfo->Probe)
+ backendinfo->Probe(type);
+-else
++else if(backendinfo->getFactory)
+ {
+ ALCbackendFactory *factory = backendinfo->getFactory();
+ V(factory,probe)(type);
--
jca | PGP : 0x1524E7EE / 513
Re: UPDATE: x11/fluxbox 1.3.7 => 1.3.7.0.20171119
On 12/27/17 18:07, Brian Callahan wrote:
Hi ports --
For the fluxbox users out there, here's a diff to update fluxbox to
the tip of development, bringing in 3 years worth of improvements and
bug fixes. Two of our patches go away. Re-take MAINTAINER.
This is more of a preview, but I'd be happy to take oks too. Been
running fluxbox from head for at least the last 2 years or so.
~Brian
ugh, forgot to add the COMPILER line. New patch attached.
Index: Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile 26 Jul 2017 22:45:32 - 1.86
+++ Makefile 27 Dec 2017 23:08:22 -
@@ -1,21 +1,25 @@
-# $OpenBSD: Makefile,v 1.86 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2017/06/02 11:33:16 schwarze Exp $
COMMENT = window manager based on the original Blackbox code
-DISTNAME = fluxbox-1.3.7
+DISTNAME = fluxbox-1.3.7.0.20171119
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = http://fluxbox.org/
+MAINTAINER = Brian Callahan
# X11
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
-WANTLIB += freetype fribidi iconv m ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} Imlib2 X11 Xext Xft Xinerama Xpm
+WANTLIB += Xrandr Xrender c fontconfig freetype fribidi iconv
+WANTLIB += m z
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+MASTER_SITES = https://devio.us/~bcallah/source/
-LIB_DEPENDS= converters/libiconv \
+# C++11
+COMPILER = base-clang ports-gcc ports-clang
+
+LIB_DEPENDS = converters/libiconv \
devel/fribidi \
graphics/imlib2
Index: distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo 9 Feb 2015 15:52:13 - 1.29
+++ distinfo 27 Dec 2017 23:08:22 -
@@ -1,2 +1,2 @@
-SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
-SIZE (fluxbox-1.3.7.tar.gz) = 1267833
+SHA256 (fluxbox-1.3.7.0.20171119.tar.gz) = I6n2X722EegHKVJZzcmmO9VMcJZWY50CW8IeTLbZFFo=
+SIZE (fluxbox-1.3.7.0.20171119.tar.gz) = 1514237
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/fluxbox/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Feb 2015 15:52:13 - 1.4
+++ patches/patch-Makefile_in 27 Dec 2017 23:08:22 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.4 2015/02/09 15:52:13 dcoppa Exp $
Makefile.in.orig Sun Feb 8 04:44:52 2015
-+++ Makefile.in Mon Feb 9 04:26:49 2015
-@@ -5275,7 +5275,6 @@ src/defaults.hh:
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -5307,7 +5307,6 @@ src/defaults.hh:
src/defaults.cc: force
@( \
@@ -9,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2015/0
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
-@@ -5284,11 +5283,7 @@ src/defaults.cc: force
+@@ -5316,11 +5315,7 @@ src/defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
Index: patches/patch-util_fluxbox-generate_menu_in
===
RCS file: patches/patch-util_fluxbox-generate_menu_in
diff -N patches/patch-util_fluxbox-generate_menu_in
--- patches/patch-util_fluxbox-generate_menu_in 9 Feb 2015 15:52:13 - 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.11 2015/02/09 15:52:13 dcoppa Exp $
-
-Adapt to our non-GNU grep
-
util/fluxbox-generate_menu.in.orig Sun Feb 8 04:44:45 2015
-+++ util/fluxbox-generate_menu.in Mon Feb 9 04:26:49 2015
-@@ -330,7 +330,7 @@ searchForIcon(){
- # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\>"
- if [ -f "$entry_icon" ]; then
- # if icon exists and entry does not already exists, add it
--if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\>" $ICONMAPPING 2> /dev/null; then
-+if ! grep -q "^.${execname}.[[:space:]]*<.*/${icon_base}\>" $ICONMAPPING 2> /dev/null; then
- printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
- else
- : echo "#mapping already exists for ${execname}" >> $ICONMAPPING
Index: patches/patch-util_fluxbox-remote_cc
===
RCS file: patches/patch-util_fluxbox-remote_cc
diff -N patches/patch-util_fluxbox-remote_cc
--- patches/patch-util_fluxbox-remote_cc 22 Apr 2017 07:50:21 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_fluxbox-remote_cc,v 1.3 2017/04/22 07:50:21 jsg Exp $
util/fluxbox-remote.cc.orig Sun Feb 8 21:44:45 2015
-+++ util/fluxbox-remote.cc Sat Apr 22 17:45:31 2017
-@@ -73,7 +73
UPDATE: x11/fluxbox 1.3.7 => 1.3.7.0.20171119
Hi ports --
For the fluxbox users out there, here's a diff to update fluxbox to the
tip of development, bringing in 3 years worth of improvements and bug
fixes. Two of our patches go away. Re-take MAINTAINER.
This is more of a preview, but I'd be happy to take oks too. Been
running fluxbox from head for at least the last 2 years or so.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/x11/fluxbox/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile 26 Jul 2017 22:45:32 - 1.86
+++ Makefile 27 Dec 2017 23:02:22 -
@@ -1,21 +1,22 @@
-# $OpenBSD: Makefile,v 1.86 2017/07/26 22:45:32 sthen Exp $
+# $OpenBSD: Makefile,v 1.83 2017/06/02 11:33:16 schwarze Exp $
COMMENT = window manager based on the original Blackbox code
-DISTNAME = fluxbox-1.3.7
+DISTNAME = fluxbox-1.3.7.0.20171119
CATEGORIES = x11
-REVISION = 3
HOMEPAGE = http://fluxbox.org/
+MAINTAINER = Brian Callahan
# X11
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
-WANTLIB += freetype fribidi iconv m ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} Imlib2 X11 Xext Xft Xinerama Xpm
+WANTLIB += Xrandr Xrender c fontconfig freetype fribidi iconv
+WANTLIB += m z
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
+MASTER_SITES = https://devio.us/~bcallah/source/
-LIB_DEPENDS= converters/libiconv \
+LIB_DEPENDS = converters/libiconv \
devel/fribidi \
graphics/imlib2
Index: distinfo
===
RCS file: /cvs/ports/x11/fluxbox/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo 9 Feb 2015 15:52:13 - 1.29
+++ distinfo 27 Dec 2017 23:02:22 -
@@ -1,2 +1,2 @@
-SHA256 (fluxbox-1.3.7.tar.gz) = yZ4rqgb/8eljQrIEFQWdEv8fopF63gFzx1svpXApW58=
-SIZE (fluxbox-1.3.7.tar.gz) = 1267833
+SHA256 (fluxbox-1.3.7.0.20171119.tar.gz) = I6n2X722EegHKVJZzcmmO9VMcJZWY50CW8IeTLbZFFo=
+SIZE (fluxbox-1.3.7.0.20171119.tar.gz) = 1514237
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/fluxbox/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 9 Feb 2015 15:52:13 - 1.4
+++ patches/patch-Makefile_in 27 Dec 2017 23:02:22 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.4 2015/02/09 15:52:13 dcoppa Exp $
Makefile.in.orig Sun Feb 8 04:44:52 2015
-+++ Makefile.in Mon Feb 9 04:26:49 2015
-@@ -5275,7 +5275,6 @@ src/defaults.hh:
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -5307,7 +5307,6 @@ src/defaults.hh:
src/defaults.cc: force
@( \
@@ -9,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2015/0
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
-@@ -5284,11 +5283,7 @@ src/defaults.cc: force
+@@ -5316,11 +5315,7 @@ src/defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
Index: patches/patch-util_fluxbox-generate_menu_in
===
RCS file: patches/patch-util_fluxbox-generate_menu_in
diff -N patches/patch-util_fluxbox-generate_menu_in
--- patches/patch-util_fluxbox-generate_menu_in 9 Feb 2015 15:52:13 - 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.11 2015/02/09 15:52:13 dcoppa Exp $
-
-Adapt to our non-GNU grep
-
util/fluxbox-generate_menu.in.orig Sun Feb 8 04:44:45 2015
-+++ util/fluxbox-generate_menu.in Mon Feb 9 04:26:49 2015
-@@ -330,7 +330,7 @@ searchForIcon(){
- # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\>"
- if [ -f "$entry_icon" ]; then
- # if icon exists and entry does not already exists, add it
--if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\>" $ICONMAPPING 2> /dev/null; then
-+if ! grep -q "^.${execname}.[[:space:]]*<.*/${icon_base}\>" $ICONMAPPING 2> /dev/null; then
- printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
- else
- : echo "#mapping already exists for ${execname}" >> $ICONMAPPING
Index: patches/patch-util_fluxbox-remote_cc
===
RCS file: patches/patch-util_fluxbox-remote_cc
diff -N patches/patch-util_fluxbox-remote_cc
--- patches/patch-util_fluxbox-remote_cc 22 Apr 2017 07:50:21 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-util_fluxbox-remote_cc,v 1.3 2017/04/22 07:50:21 jsg Exp $
util/fluxbox-remote.cc.orig Sun Feb 8 21:44:45 2015
-+++ util/fluxbox-remote.cc Sat Apr 22 17:45:31 2017
-@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
- if (strcmp(cmd, "result") == 0) {
- XTextProperty text_prop;
- if (XGetTextProperty(disp, root, &t
That texlive + poppler drama - luatex torture volunteers needed
Hi,
below is a diff against the current print/texlive/base which does
*not* work. It breaks at least pdftex/pdflatex, leading to memory
corruption when using \includegraphics{} on a pdf file. My favorite I
just hit with egdb:
(gdb) print entries
$1 = (DictEntry *) 0x7
(7 is a lucky number, but only for humans and certainly not for
pointers)
I *think* I know how to fix this (based on a diff from the archlinux
people), but I've only test files for reproducing the problem with
pdftex/pdflatex. Unfortunately, luatex is most probably also affected,
and even if my diff includes parts of an older archlinux patch for
luatex, it maybe incomplete. And I don't have any idea what luatex
is and how to use it ;-)
So, if anyone is able to try to get luatex built from the diff below
to crash, with a *small* input, I'd be super happy, because that
could help a little bit to ensure that the recent patch from archlinux
really fix it.
Test files for reproducing the problem with pdftex/pdflatex:
https://bugs.archlinux.org/task/55720#comment161476
(further down, someone posts a patch, which probably got finally
committed:
https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/texlive-bin&id=9d93b64063f7d98568d4f029453c7edf5597a7b4
So, anyone who gets a nice reproducible segfault or other crash out
of luatex with the diff below will get a free beer or two should
we ever meet in real live.
Ciao,
Kili
Index: Makefile
===
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.95
diff -u -p -r1.95 Makefile
--- Makefile25 Dec 2017 22:50:42 - 1.95
+++ Makefile27 Dec 2017 22:18:24 -
@@ -1,5 +1,7 @@
# $OpenBSD: Makefile,v 1.95 2017/12/25 22:50:42 kili Exp $
+DEBUG = -g -O0
+
COMMENT = base binaries for TeXLive typesetting distribution
# This year they used a different datestamp on the -source tarball.
@@ -19,7 +21,7 @@ SHARED_LIBS +=texlua520.0 # 7.4
WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xi Xmu Xpm Xrender Xt
WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2
WANTLIB += harfbuzz harfbuzz-icu iconv icudata icui18n icuio icuuc intl
-WANTLIB += jpeg m paper pcre pixman-1 png
+WANTLIB += jpeg lcms2 m openjp2 paper pcre pixman-1 png poppler
WANTLIB += potrace pthread ${COMPILER_LIBCXX} tiff webp xcb
WANTLIB += xcb-render xcb-shm z zzip
WANTLIB += ${LIBCXX}
@@ -35,6 +37,7 @@ RUN_DEPENDS = print/ghostscript/gnu \
LIB_DEPENDS = converters/libiconv \
graphics/png \
graphics/gd \
+ print/poppler \
graphics/cairo \
textproc/icu4c \
graphics/graphite2 \
@@ -45,11 +48,17 @@ LIB_DEPENDS = converters/libiconv \
MODULES = textproc/intltool perl
+# c++-11 required for poppler
+COMPILER = base-clang ports-gcc
+
# Never set SEPARATE_BUILD
CONFIGURE_STYLE = gnu
CPPFLAGS = -I${X11BASE}/include \
- -I${LOCALBASE}/include
+ -I${LOCALBASE}/include \
+ -I${LOCALBASE}/include/poppler
+
+CXXFLAGS +=-std=c++11
LDFLAGS = -L${LOCALBASE}/lib \
-L${X11BASE}/lib
@@ -83,10 +92,6 @@ PKG_ARGS += -Dxindy=1
PKG_ARGS +=-Dxindy=0
.endif
-# --with-system-poppler and --with-system-xpdf temporarily removed to
-# build it with the bundled poppler, because xpdftex fails to build
-# without patches and a newer poppler (> 0.58), and it fails at runtime
-# with my current patches to build with the new poppler object API.
CONFIGURE_ARGS += --mandir=${PREFIX}/man \
--with-system-freetype2 \
--with-system-gd \
@@ -109,10 +114,12 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man
--with-banner-add="-OpenBSD_Ports" \
--disable-luajittex \
--disable-mfluajit \
+ --with-system-xpdf \
--with-system-icu \
--with-system-cairo \
--with-system-harfbuzz \
--with-system-graphite2 \
+ --with-system-poppler \
--with-system-libpaper \
--with-system-zziplib \
--with-system-potrace
Index: patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w
===
RCS file:
/cvs/ports/print/texlive/base/patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w,v
retrieving revision 1.1
diff -u -p -r1.1 patch-texk_web2c_luatexdir_image_pdftoepdf_w
--- patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w15 Oct 2017
19:07:33 - 1.1
+++ patches/patch-texk_web2c_luatexdir_image_pdftoepdf_w27 Dec 2017
22:18
Re: [NEW] textproc/loccount 1.2
Klemens Nanni(k...@posteo.org) on 2017.12.25 16:41:42 +0100: > On Thu, Nov 09, 2017 at 12:11:05AM +0100, Klemens Nanni wrote: > > Hey ports@, > > > > here's https://gitlab.com/esr/loccount/, from DESCR: > > > > loccount is a re-implementation of David A. Wheeler's sloccount tool in > > Go. It is faster and handles more different languages. Because it's one > > source file in Go, it is easier to maintain and extend than the > > multi-file, multi-language implementation of the original. > > > > The algorithms are largely unchanged and can be expected to produce > > identical numbers for languages supported by both tools. Python is an > > exception; loccount corrects buggy counting of single-quote multiline > > literals in sloccount 2.26. > 1.2 from 05.12.2017 fixes a bug in the parallelized treewalker so here's > an updated tarball including all of the previous feedback of course. > > Anyone willing to commit this? yeah, i can do this. any oks? sthen?
UPDATE: devel/qbs
Simple update to the latest stable version. Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/qbs/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile21 Oct 2017 19:58:27 - 1.3
+++ Makefile27 Dec 2017 21:00:39 -
@@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2017/10/21 19:58:27 rsadowski Exp $
COMMENT = declarative cross-platform build tool
-V =1.9.1
+V =1.10.0
DISTNAME = qbs-src-${V}
PKGNAME = qbs-${V}
-SHARED_LIBS = qbscore 2.0
+SHARED_LIBS = qbscore 3.0
SHARED_LIBS += qbsqtprofilesetup 1.4
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/qbs/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo21 Oct 2017 19:58:27 - 1.2
+++ distinfo27 Dec 2017 21:00:39 -
@@ -1,2 +1,2 @@
-SHA256 (qbs-src-1.9.1.tar.gz) = lwBIhCWBvABO7JrJd3pJOAwD9OAe960wmBOqEFSHAHM=
-SIZE (qbs-src-1.9.1.tar.gz) = 4007946
+SHA256 (qbs-src-1.10.0.tar.gz) = OK+uO2l7luB9U8/GTdA1M/3ewFLs3AjY53eUQMNsPs0=
+SIZE (qbs-src-1.10.0.tar.gz) = 4130630
Index: patches/patch-doc_man_man_pri
===
RCS file: patches/patch-doc_man_man_pri
diff -N patches/patch-doc_man_man_pri
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_man_man_pri 27 Dec 2017 21:00:39 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: doc/man/man.pri
+--- doc/man/man.pri.orig
doc/man/man.pri
+@@ -1,5 +1,5 @@
+ qbs_no_man_install: return()
+
+ man.files = $$PWD/qbs.1
+-man.path = $${QBS_INSTALL_PREFIX}/share/man/man1
++man.path = $${QBS_INSTALL_PREFIX}/man/man1
+ INSTALLS += man
Index: patches/patch-doc_man_man_qbs
===
RCS file: patches/patch-doc_man_man_qbs
diff -N patches/patch-doc_man_man_qbs
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_man_man_qbs 27 Dec 2017 21:00:39 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: doc/man/man.qbs
+--- doc/man/man.qbs.orig
doc/man/man.qbs
+@@ -18,7 +18,7 @@ Product {
+ name: "man page"
+ files: ["qbs.1"]
+ qbs.install: qbsbuildconfig.installManPage
+-qbs.installDir: "share/man/man1"
++qbs.installDir: "man/man1"
+ }
+
+ Group {
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/qbs/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 27 Sep 2017 10:06:22 - 1.2
+++ pkg/PLIST 27 Dec 2017 21:00:39 -
@@ -60,6 +60,7 @@ lib/qbs/plugins/libvisualstudiogenerator
libexec/qbs/
libexec/qbs/dmgbuild
@bin libexec/qbs/qbs_processlauncher
+@man man/man1/qbs.1
share/qbs/
share/qbs/examples/
share/qbs/examples/app-and-lib/
@@ -149,6 +150,13 @@ share/qbs/examples/collidingmice/main.cp
share/qbs/examples/collidingmice/mice.qrc
share/qbs/examples/collidingmice/mouse.cpp
share/qbs/examples/collidingmice/mouse.h
+share/qbs/examples/compiled-qml/
+share/qbs/examples/compiled-qml/MainForm.ui.qml
+share/qbs/examples/compiled-qml/cheese.jpg
+share/qbs/examples/compiled-qml/main.cpp
+share/qbs/examples/compiled-qml/main.qml
+share/qbs/examples/compiled-qml/myapp.qbs
+share/qbs/examples/compiled-qml/qml.qrc
share/qbs/examples/examples.qbs
share/qbs/examples/helloworld-complex/
share/qbs/examples/helloworld-complex/hello.qbs
@@ -204,6 +212,7 @@ share/qbs/imports/qbs/Probes/GccVersionP
share/qbs/imports/qbs/Probes/IncludeProbe.qbs
share/qbs/imports/qbs/Probes/InnoSetupProbe.qbs
share/qbs/imports/qbs/Probes/JdkProbe.qbs
+share/qbs/imports/qbs/Probes/JdkVersionProbe.qbs
share/qbs/imports/qbs/Probes/MsvcProbe.qbs
share/qbs/imports/qbs/Probes/NodeJsProbe.qbs
share/qbs/imports/qbs/Probes/NpmProbe.qbs
@@ -257,7 +266,6 @@ share/qbs/modules/bundle/BundleModule.qb
share/qbs/modules/bundle/MacOSX-Package-Types.xcspec
share/qbs/modules/bundle/MacOSX-Product-Types.xcspec
share/qbs/modules/bundle/bundle.js
-share/qbs/modules/bundle/update-specs.sh
share/qbs/modules/cli/
share/qbs/modules/cli/CLIModule.qbs
share/qbs/modules/cli/cli.js
@@ -283,6 +291,8 @@ share/qbs/modules/cpp/tvos-gcc.qbs
share/qbs/modules/cpp/watchos-gcc.qbs
share/qbs/modules/cpp/windows-mingw.qbs
share/qbs/modules/cpp/windows-msvc.qbs
+share/qbs/modules/cpufeatures/
+share/qbs/modules/cpufeatures/cpufeatures.qbs
share/qbs/modules/dmg/
share/qbs/modules/dmg/DMGModule.qbs
share/qbs/modules/dmg/dmg.js
@@ -323,6 +333,8 @@ share/qbs/modules/typescript/TypeScriptM
share/qbs/modules/typescript/qbs-tsc-scan/
share/qbs/modules/typescript/qbs-tsc-scan/qbs-tsc-scan.ts
share/qbs/modules/typescript/typescript.js
+share/qbs/modules/vcs/
+share/qbs/modules/vcs/vcs-module.qbs
share/qbs/modules/wix/
share/qbs/modules/wix/WiXModule.qbs
share/qbs/modules/xcode/
NEW: graphics/drawpile
Hi ports -- Attached is a new port, graphics/drawpile. Drawpile is a collaborative drawing program. --- pkg/DESCR: Drawpile is a Free/Libre networked drawing program that allows multiple people to sketch on the same image simultaneously. It supports the OpenRaster image file format and thus works well with applications such as MyPaint, Krita and GIMP. --- This requires libmicrohttpd that was just committed. Only tested on amd64--I was able to connect to some sessions and draw, and draw my own non-networked painting. There's a link to the current live network sessions on the port HOMEPAGE. OK? ~Brian drawpile.tgz Description: Binary data
Re: NEW: www/libmicrohttpd
On 12/27/17 09:04, Stuart Henderson wrote: On 2017/12/27 07:28, Landry Breuil wrote: Maybe USE_LIBTOOL=Yes is in order too ? huh? Hopefully last round. Now again without USE_LIBTOOL, but with the BDEPs and TDEPs. ~Brian libmicrohttpd.tgz Description: Binary data
[update] samba-4.6.12
An bugfix update to the latest version on the 4.6 branch only
build-tested. Upstream changelog at:
https://www.samba.org/samba/history/samba-4.6.12.html
Test reports/oks welcome.
Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.246
diff -u -p -r1.246 Makefile
--- Makefile22 Nov 2017 16:15:44 - 1.246
+++ Makefile27 Dec 2017 14:33:32 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.246 2017/11/22 16:15:44 jca Exp $
-VERSION = 4.6.11
+VERSION = 4.6.12
DISTNAME = samba-${VERSION}
COMMENT-main = SMB and CIFS client and server for UNIX
@@ -19,6 +19,9 @@ PKG_ARCH-docs = *
LDB_V =1.1.29
TEVENT_V = 0.9.34
+
+REVISION-ldb = 0
+REVISION-tevent = 0
SHARED_LIBS = asn1-samba4 0.0 \
com_err-samba4 0.0 \
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.63
diff -u -p -r1.63 distinfo
--- distinfo22 Nov 2017 16:15:44 - 1.63
+++ distinfo27 Dec 2017 14:28:58 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.6.11.tar.gz) = BRt6sPoIjXfcDfA5/11rj9mYNy8MKey0VbFJRXwg7R0=
-SIZE (samba-4.6.11.tar.gz) = 21157318
+SHA256 (samba-4.6.12.tar.gz) = GPHIm7Zoe5QID17IqnPBSs2tEQZCVAOUWjKSikseVKE=
+SIZE (samba-4.6.12.tar.gz) = 21160637
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: new hs-ports: devel/hs-echo, devel/hs-edit-distance
On Wed, Dec 27, 2017 at 06:18:09PM +0100, Matthias Kilian wrote:
> devel/hs-edit-distance:
>
> COMMENT = Levenshtein edit distances
>
> DESCR:
>
> Optimized edit distances for fuzzy matching, including Levenshtein
> and restricted Damerau-Levenshtein algorithms.
Damned! I missed a dependency (devel/hs-random).
New version attached. In addition to ghc-8.2.2, you'll also need the
diff below to build devel/hs-random with it.
Index: Makefile
===
RCS file: /cvs/ports/devel/hs-random/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile7 Nov 2017 21:19:40 - 1.11
+++ Makefile27 Dec 2017 17:48:10 -
@@ -7,7 +7,7 @@ COMMENT = random number library
PORTROACH =ignore:1
DISTNAME = random-1.1
-REVISION = 2
+REVISION = 3
CATEGORIES = devel
MAINTAINER = Matthias Kilian
@@ -19,6 +19,6 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-MODGHC_PACKAGE_KEY = 54KmMHXjttlERYcr1mvsAe
+MODGHC_PACKAGE_KEY = LLUGZ7T9DqQ5vN0Jbcd0We
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-random/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 19 Sep 2015 08:01:03 - 1.5
+++ pkg/PLIST 27 Dec 2017 17:48:10 -
@@ -14,12 +14,9 @@ share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
share/doc/hs-${DISTNAME}/html/System-Random.html
share/doc/hs-${DISTNAME}/html/doc-index.html
-share/doc/hs-${DISTNAME}/html/frames.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/hslogo-16.png
-share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
-share/doc/hs-${DISTNAME}/html/mini_System-Random.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
Ciao,
Kili
hs-edit-distance.tgz
Description: application/tar-gz
Re: [new] databases/influxdb
On 2017/12/25 07:34, Landry Breuil wrote: > On Sun, Dec 24, 2017 at 08:27:11PM +, Stuart Henderson wrote: > > On 2017/12/24 10:35, Landry Breuil wrote: > > > Hi, > > > > > > here's a port for influxdb 1.4.2, a time series database to store > > > metrics/events/analytics. I had to fight a bit with go.port.mk, and hack > > > my way around bundling the dependencies (which are vendored in the > > > selfhosted tarball) but it builds, installs and starts fine. > > > > > > I haven't done any real testing yet (read: send metrics to it and try to > > > read them) but it can be used as a target for collectd network plugin, > > > ie replacing old-school rrd storage (no need for rrdcached anymore!), > > > and facette is supposed to be able to read metrics from it. Of course, > > > the next step is to port grafana.. > > > > > > Testing & feedback welcome! > > > > > > Landry > > > > GH_* shouldn't be set alongside MASTER_SITES .. Probably should just be > > the usual DISTNAME and/or PKGNAME .. > > Well, for now it's more a convenience so that i can fetch the original > source from github (without the vendored dependencies) - this way i only > need to comment MASTER_SITES/EXTRACT_SUFX and run make tarball. > Maybe a comment would help ? Or commented out values ? > Probably better if that fetching is handled in 'make tarball' I think, it's even more confusing to temporarily use ports distfile fetching as an intermediate step to producing the actual ports distfile.. Maybe one day the developers of go software will figure out what a complete mess they have made of source distribution.
new hs-ports: devel/hs-echo, devel/hs-edit-distance
Hi, for updating devel/cabal-install to version 2.0.0.1 (which is probably the best version for use with ghc-8.2.2), two new hs-ports are needed: devel/hs-echo: COMMENT = cross-platform echoing terminal input DESCR: The base library exposes the hGetEcho and hSetEcho functions for querying and setting echo status, but unfortunately, neither function works with MinTTY consoles on Windows. This library provides an alternative interface which works with both MinTTY and other consoles. devel/hs-edit-distance: COMMENT = Levenshtein edit distances DESCR: Optimized edit distances for fuzzy matching, including Levenshtein and restricted Damerau-Levenshtein algorithms. If you want to build them, you'll also have to build ghc-8.2.2 from the diff I sent about twoo weeks ago: https://marc.info/?l=openbsd-ports&m=151312144401005&w=2 ok to import them either (but leave them unhooked until I'm ready to update ghc)? Ciao, Kili hs-echo.tgz Description: application/tar-gz hs-edit-distance.tgz Description: application/tar-gz
[UPDATE] www/youtube-dl
Attached update to 2017.12.23 version.
ITV - site has been making changes which means the odd download uses hls
instead of rtmp.
This is updated to verify download is still possible.
I've gone no further than checking ITV.
2017.11.26 version fails as follows...
$ youtube-dl https://www.itv.com/hub/maigret/2a4244a0004
WARNING: Assuming --restrict-filenames since file system encoding cannot encode
all characters. Set the LC_ALL environment variable to fix this.
[ITV] 2a4244a0004: Downloading webpage
[ITV] 2a4244a0004: Downloading XML
ERROR: ITV said: Video production has no renditions for DotCom platform.;
please report this issue on https://yt-dl.org/bug . Make sure you are using the
latest version; see https://yt-dl.org/update on how to update. Be sure to
call youtube-dl with the --verbose flag and include its
complete output.
2017-12-23 version the ITV download ok as below...
$ youtube-dl -f hls-767 https://www.itv.com/hub/maigret/2a4244a0004
WARNING: Assuming --restrict-filenames since file system encoding cannot encode
all characters. Set the LC_ALL environment variable to fix this.
[ITV] 2a4244a0004: Downloading webpage
[ITV] 2a4244a0004: Downloading XML
[ITV] 2a4244a0004: Downloading JSON metadata
[ITV] 2a4244a0004: Downloading m3u8 information
[hlsnative] Downloading m3u8 manifest
[hlsnative] Total fragments: 449
[download] Destination: Maigret_-_Maigret_in_Montmartre-2a4244a0004.mp4
[download] 100% of 473.05MiB in 04:23
[ffmpeg] Fixing malformed AAC bitstream in
"Maigret_-_Maigret_in_Montmartre-2a4244a0004.mp4"
Issue reported was fixed in 2017.12.14 version and later.
[itv] Improve extraction (#14944)
Index: Makefile
===
RCS file: /home/cvs/ports/www/youtube-dl/Makefile,v
retrieving revision 1.173
diff -u -p -r1.173 Makefile
--- Makefile 4 Dec 2017 13:38:11 - 1.173
+++ Makefile 26 Dec 2017 15:52:17 -
@@ -2,7 +2,7 @@
COMMENT = CLI program to download videos from YouTube and other sites
-VERSION = 2017.11.26
+VERSION = 2017.12.23
MODPY_EGG_VERSION = ${VERSION:S/.0/./g}
DISTNAME = youtube-dl-${VERSION}
Index: distinfo
===
RCS file: /home/cvs/ports/www/youtube-dl/distinfo,v
retrieving revision 1.160
diff -u -p -r1.160 distinfo
--- distinfo 4 Dec 2017 13:38:11 - 1.160
+++ distinfo 26 Dec 2017 15:52:50 -
@@ -1,2 +1,2 @@
-SHA256 (youtube-dl-2017.11.26.tar.gz) = R9MK7InNJFa37nAmxmwO5PVqt9JwDESvJ74OAGJ9LVo=
-SIZE (youtube-dl-2017.11.26.tar.gz) = 2839867
+SHA256 (youtube-dl-2017.12.23.tar.gz) = hSBsRqkKiZOxM7ndDg7I/G81gGDf6ltcYHqliptcoYo=
+SIZE (youtube-dl-2017.12.23.tar.gz) = 2859430
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/www/youtube-dl/pkg/PLIST,v
retrieving revision 1.114
diff -u -p -r1.114 PLIST
--- pkg/PLIST 4 Dec 2017 13:38:11 - 1.114
+++ pkg/PLIST 26 Dec 2017 15:55:14 -
@@ -95,6 +95,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}audioboom.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}audiomack.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}awaan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}azmedien.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}baidu.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}bambuser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -218,7 +219,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}eighttracks.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}einthusan.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}eitb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}ellentv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}ellentube.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}elpais.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extractor/${MODPY_PYCACHE}embedly.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/youtube_dl/extracto
Re: NEW: www/libmicrohttpd
On 2017/12/27 07:28, Landry Breuil wrote: > Maybe > USE_LIBTOOL=Yes is in order too ? huh?
Re: NEW: www/libmicrohttpd
On 12/27/17 08:09, Theo Buehler wrote: On Wed, Dec 27, 2017 at 07:28:55AM +0100, Landry Breuil wrote: On Wed, Dec 27, 2017 at 12:18:24AM -0500, Brian Callahan wrote: Hi ports -- Attached is a new port, www/libmicrohttpd. libmicrohttpd is a tiny embeddable httpd library written in C. --- pkg/DESCR: GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application. Features: * C library: fast and small * API is simple, expressive and fully reentrant * Implementation is HTTP 1.1 compliant * HTTP server can listen on multiple ports * Four different threading models (select, poll, pthread, thread pool) * Support for IPv6 * Support for SHOUTcast * Support for incremental processing of POST data * Support for basic and digest authentication * Support for TLS --- This is a dependency of an upcoming port. Builds and all tests pass on amd64 and armv7. I think curl should also be a BDEP, since configure checks for it to be able to build the tests... Agreed. Some more tests are run (and pass) when misc/zzuf and net/socat are added to the BDEPs. Three testcurl/https tests are skipped, at least two of them because they would need libcurl-gnutls. have you tried building without curl installed, and then running the tests ? Other than this minor nit it looks okay, builds fine on i386. Maybe USE_LIBTOOL=Yes is in order too ? New port attached incorporating on- and off-list feedback. ~Brian libmicrohttpd.tgz Description: Binary data
UPDATE: audio/taglib
Hi All,
please find below a diff to update taglib to the latest stable version.
build test with the following consumers:
audio/ario
audio/audacity
audio/cantata
audio/chromaprint
audio/clementine
audio/easytag
audio/gimmix
audio/gmpc-plugins
audio/gogglesmm
audio/moc
audio/mono-taglib
audio/musique
audio/ncmpcpp
audio/py-tagpy
audio/ruby-taglib
devel/kf5/kfilemetadata
games/mars
multimedia/gstreamer-0.10/plugins-good
multimedia/gstreamer1/plugins-good
multimedia/k3b-kde4
multimedia/mediatomb
multimedia/vitunes
net/ezstream
net/ktorrent-kde4
sysutils/krename-kde4
x11/gnome/tracker-miners
x11/gnustep/cynthiune
x11/kde4/juk
x11/kde4/kfilemetadata
x11/kde4/nepomuk-core
x11/pinot
x11/tellico-kde4
x11/vlc
x11/xfce4
Drop test because, test suite is switched off when we set
BUILD_SHARED_LIBS.
Comments? Ok?
Best regards,
Rafael
Index: Makefile
===
RCS file: /cvs/ports/audio/taglib/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- Makefile26 Jul 2017 22:45:16 - 1.40
+++ Makefile27 Dec 2017 08:42:28 -
@@ -1,34 +1,25 @@
# $OpenBSD: Makefile,v 1.40 2017/07/26 22:45:16 sthen Exp $
COMMENT= managing meta-data of audio formats
-DISTNAME= taglib-1.9.1
-REVISION = 3
+DISTNAME= taglib-1.11.1
CATEGORIES=audio devel
-MASTER_SITES= http://taglib.github.io/releases/
+SHARED_LIBS += tag 12.0# 1.9.1
+SHARED_LIBS += tag_c 3.0 # 0.0.0
-SHARED_LIBS += tag 11.0# 1.9.1
-SHARED_LIBS += tag_c 2.1 # 0.0.0
-
-HOMEPAGE= http://taglib.github.io/
+HOMEPAGE= https://taglib.github.io/
# LGPLv2.1 / MPLv1.1
PERMIT_PACKAGE_CDROM= Yes
-MODULES= devel/cmake
-
WANTLIB= ${COMPILER_LIBCXX} m z
-BUILD_DEPENDS= devel/cppunit
+MASTER_SITES= https://taglib.github.io/releases/
-CONFIGURE_ARGS=-DCMAKE_POLICY_DEFAULT_CMP0022=OLD \
- -DBUILD_TESTS:BOOL=ON
+MODULES= devel/cmake
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cmake/modules/FindCppUnit.cmake
+CONFIGURE_ARGS=-DBUILD_SHARED_LIBS:BOOL=ON
-do-test:
- @ln -f -s ${WRKSRC}/tests/data ${WRKBUILD}/tests/data
- @cd ${WRKBUILD}/tests && ./test_runner
+NO_TEST= Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/taglib/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo28 Nov 2013 15:49:25 - 1.12
+++ distinfo27 Dec 2017 08:42:28 -
@@ -1,2 +1,2 @@
-SHA256 (taglib-1.9.1.tar.gz) = ctNxzRQZqHriAER6U7/yviGSgwcegP0SM3kozJZ9xxo=
-SIZE (taglib-1.9.1.tar.gz) = 654074
+SHA256 (taglib-1.11.1.tar.gz) = ttGlphCq5v852T3l79D9x4eqnp3B5wJvpMlhsmVjUms=
+SIZE (taglib-1.11.1.tar.gz) = 1261620
Index: patches/patch-cmake_modules_FindCppUnit_cmake
===
RCS file: patches/patch-cmake_modules_FindCppUnit_cmake
diff -N patches/patch-cmake_modules_FindCppUnit_cmake
--- patches/patch-cmake_modules_FindCppUnit_cmake 14 Oct 2011 09:06:57
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-cmake_modules_FindCppUnit_cmake,v 1.1 2011/10/14 09:06:57
dcoppa Exp $
cmake/modules/FindCppUnit.cmake.orig Thu Oct 13 10:21:42 2011
-+++ cmake/modules/FindCppUnit.cmakeThu Oct 13 10:22:30 2011
-@@ -30,8 +30,8 @@ ELSE(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
- STRING(REGEX REPLACE "-I(.+)" "\\1" CPPUNIT_CFLAGS
"${CPPUNIT_CFLAGS}")
- ELSE(CPPUNIT_CONFIG_EXECUTABLE)
- # in case win32 needs to find it the old way?
--FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS /usr/include
/usr/local/include )
--FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS /usr/lib
/usr/local/lib )
-+FIND_PATH(CPPUNIT_CFLAGS cppunit/TestRunner.h PATHS
${LOCALBASE}/include )
-+FIND_LIBRARY(CPPUNIT_LIBRARIES NAMES cppunit PATHS ${LOCALBASE}/lib )
- # how can we find cppunit version?
- MESSAGE (STATUS "Ensure you cppunit installed version is at least
${CPPUNIT_MIN_VERSION}")
- SET (CPPUNIT_INSTALLED_VERSION ${CPPUNIT_MIN_VERSION})
Index: patches/patch-taglib_toolkit_tbytevector_cpp
===
RCS file: patches/patch-taglib_toolkit_tbytevector_cpp
diff -N patches/patch-taglib_toolkit_tbytevector_cpp
--- patches/patch-taglib_toolkit_tbytevector_cpp10 Nov 2014 10:55:58
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,106 +0,0 @@
-$OpenBSD: patch-taglib_toolkit_tbytevector_cpp,v 1.1 2014/11/10 10:55:58
dcoppa Exp $
-
-From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
-From: Tsuda Kageyu
-Date: Thu, 14 Nov 2013 14:05:32 +0900
-Subject: [PATCH] Rewrote ByteVector::replace() simpler
-
taglib/toolkit/tbytevector.cpp.origTue Oct 8 17:50:01 2013
-+++ taglib/toolkit/tbytevector.cpp
Re: NEW: www/libmicrohttpd
On Wed, Dec 27, 2017 at 07:28:55AM +0100, Landry Breuil wrote: > On Wed, Dec 27, 2017 at 12:18:24AM -0500, Brian Callahan wrote: > > Hi ports -- > > > > Attached is a new port, www/libmicrohttpd. libmicrohttpd is a tiny > > embeddable httpd library written in C. > > > > --- > > pkg/DESCR: > > GNU libmicrohttpd is a small C library that is supposed to make it easy > > to run an HTTP server as part of another application. > > > > Features: > > * C library: fast and small > > * API is simple, expressive and fully reentrant > > * Implementation is HTTP 1.1 compliant > > * HTTP server can listen on multiple ports > > * Four different threading models (select, poll, pthread, thread pool) > > * Support for IPv6 > > * Support for SHOUTcast > > * Support for incremental processing of POST data > > * Support for basic and digest authentication > > * Support for TLS > > --- > > > > This is a dependency of an upcoming port. > > > > Builds and all tests pass on amd64 and armv7. > > I think curl should also be a BDEP, since configure checks for it to be > able to build the tests... Agreed. Some more tests are run (and pass) when misc/zzuf and net/socat are added to the BDEPs. Three testcurl/https tests are skipped, at least two of them because they would need libcurl-gnutls. > have you tried building without curl > installed, and then running the tests ? > Other than this minor nit it looks okay, builds fine on i386. Maybe > USE_LIBTOOL=Yes is in order too ?
