Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre) - vinagre status
On Mon, Jan 15, 2018 at 08:25:48AM +0100, Sebastien Marie wrote: > > > > I should be able to try it today. > > > > after several tries to fix it or port some patches, it seems that > vinagre isn't functional with freerdp2. it seems that lot of internals > inside freerdp2 changed (callbacks). > > Additionally, vinagre seems in maintenance-mode only. latest commits on > past year are mostly translations (there is only 2 fixes, and no new code). > > - vinagre git log: > https://git.gnome.org/browse/vinagre/log/ > > - vinagre commits per year > https://git.gnome.org/browse/vinagre/stats/?period=y=10 > > so I doubt vinagre will have support for freerdp2 at any time. > > what direction should we take ? > > it could be possible to make x11/freerdp to provide only libfreerdp > libraries for vinagre, and have x11/freerdp2 ? or just plan to remove > vinagre ? I can speak for vinagre, but i've tested rdp and it works fine with remmina. with vnc it crashes: (gdb) bt #0 thrkill () at -:3 #1 0x1bbc1c05d9ee in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51 #2 0x1bbc1c0285d2 in _rthread_mutex_timedlock (mutexp=Variable "mutexp" is not available. ) at /usr/src/lib/libc/thread/rthread_mutex.c:118 #3 0x1bbc5892be58 in remmina_plugin_vnc_update_scale () from /usr/local/lib/remmina/plugins/remmina-plugin-vnc.so #4 0x1bbc5892af64 in remmina_plugin_vnc_rfb_allocfb () from /usr/local/lib/remmina/plugins/remmina-plugin-vnc.so #5 0x1bbb9a011e9a in rfbInitClient () from /usr/local/lib/libvncclient.so.0.0 #6 0x1bbc5892a663 in remmina_plugin_vnc_main () from /usr/local/lib/remmina/plugins/remmina-plugin-vnc.so #7 0x1bbc5892a05c in remmina_plugin_vnc_main_thread () from /usr/local/lib/remmina/plugins/remmina-plugin-vnc.so #8 0x1bbc26e99c5e in _rthread_start (v=Variable "v" is not available. ) at /usr/src/lib/librthread/rthread.c:96 #9 0x1bbc1c06ce3b in __tfork_thread () at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75 #10 0x in ?? () the ssh plugin works (in the sense that it opens a vte term on the remote server) havent tested NX.
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre) - vinagre status
> > I should be able to try it today. > after several tries to fix it or port some patches, it seems that vinagre isn't functional with freerdp2. it seems that lot of internals inside freerdp2 changed (callbacks). Additionally, vinagre seems in maintenance-mode only. latest commits on past year are mostly translations (there is only 2 fixes, and no new code). - vinagre git log: https://git.gnome.org/browse/vinagre/log/ - vinagre commits per year https://git.gnome.org/browse/vinagre/stats/?period=y=10 so I doubt vinagre will have support for freerdp2 at any time. what direction should we take ? it could be possible to make x11/freerdp to provide only libfreerdp libraries for vinagre, and have x11/freerdp2 ? or just plan to remove vinagre ? I dunno. Thanks. -- Sebastien Marie
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On Sat, Jan 13, 2018 at 10:37:06PM +, Stuart Henderson wrote: > > > > > +WANTLIB += ossaudio > > > > > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ? > > > > I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see > > client/common/CMakeLists.txt file). I did few tests, but I couldn't get > > audio (with or without using ossaudio). > > There was a big effort to remove ossaudio across as much of the ports > tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem > to be used for anything here and isn't required to build, so I think we > should just patch it away. > btw, audio bits were removed from -lossaudio, it contains the mixer "ioctls" only
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On Sat, Jan 13, 2018 at 10:37:06PM +, Stuart Henderson wrote: > On 2018/01/13 20:02, Sebastien Marie wrote: > > On Sat, Jan 13, 2018 at 02:00:50PM +, Stuart Henderson wrote: > > > On 2018/01/13 14:11, Sebastien Marie wrote: > > > > I didn't check RUN_DEPENDS, as I didn't expect command-line change. > > > > > > I wouldn't put it past them to chage command-line again ;) > > OK, I've compared the help output from old and new, diff is a bit hard > to read but it seems pretty close so I don't think there will be a problem. thanks. > > > > +WANTLIB += ossaudio > > > > > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ? > > > > I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see > > client/common/CMakeLists.txt file). I did few tests, but I couldn't get > > audio (with or without using ossaudio). > > There was a big effort to remove ossaudio across as much of the ports > tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem > to be used for anything here and isn't required to build, so I think we > should just patch it away. I removed ossaudio. > It might not be all that hard to port to sndio, if somebody actually > wants audio over this.. I agree. > xfreerdp itself still works for me. > > remmina needs cvs rm patch-* then it builds, but doesn't work > properly for me (displays the window, but doesn't do anything if > I enter a hostname and try to connect). Same behaviour at runtime. Diff updated to link as Freebsd with -rdynamic (Gtk error messages asked for it) in CMakeLists.txt. I am able to connect via RDP (sole protocol tested). I have also cvs rm old patches. > I haven't tried vinagre. I should be able to try it today. Thanks. -- Sebastien Marie Index: x11/freerdp/Makefile === RCS file: /cvs/ports/x11/freerdp/Makefile,v retrieving revision 1.29 diff -u -p -r1.29 Makefile --- x11/freerdp/Makefile9 Nov 2017 16:50:39 - 1.29 +++ x11/freerdp/Makefile14 Jan 2018 08:14:58 - @@ -5,18 +5,17 @@ BROKEN-arm = unrecognized option -mfpu= BROKEN-hppa = undefined reference to __sync_val_compare_and_swap_4 COMMENT = open source client for Windows Terminal Server -DISTNAME = freerdp-1.2.0beta1 +DISTNAME = freerdp-2.0.0rc1 CATEGORIES = x11 net -REVISION = 2 GH_ACCOUNT = FreeRDP GH_PROJECT = FreeRDP -GH_COMMIT =f5ff6e1bd819a347aa532c1ef1a9cf0c67387507 +GH_TAGNAME = 2.0.0-rc1 -SHARED_LIBS += freerdp-client0.0 # 1.2 -SHARED_LIBS += freerdp 0.0 # 1.2 -SHARED_LIBS += winpr 0.0 # 1.1 -SHARED_LIBS += xfreerdp-client 0.0 # 1.2 +SHARED_LIBS += freerdp-client2 0.0 # 2.0 +SHARED_LIBS += freerdp2 0.0 # 2.0 +SHARED_LIBS += winpr-tools2 0.0 # 2.0 +SHARED_LIBS += winpr20.0 # 2.0 HOMEPAGE = http://www.freerdp.com/ @@ -25,7 +24,6 @@ PERMIT_PACKAGE_CDROM =Yes WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile -WANTLIB += z MODULES = devel/cmake @@ -38,20 +36,14 @@ LIB_DEPENDS = devel/libexecinfo \ print/cups,-libs \ graphics/ffmpeg -CONFIGURE_ARGS += -DWITH_ALSA=OFF \ - -DWITH_CUPS=ON \ +CONFIGURE_ARGS += -DWITH_CUPS=ON \ -DWITH_DIRECTFB=OFF \ -DWITH_GSTREAMER_0_10=OFF \ -DWITH_GSTREAMER_1_0=OFF \ -DWITH_OPENSLES=OFF \ -DWITH_PCSC=ON \ - -DWITH_PULSE=OFF - -# XXX does not build -CONFIGURE_ARGS += -DCHANNEL_DRIVE=OFF - -# -msse3 requires a newer gcc -CONFIGURE_ARGS += -DWITH_SSE2=OFF + -DWITH_LIBSYSTEMD=OFF \ + -DWITH_OSS=OFF NO_TEST = Yes Index: x11/freerdp/distinfo === RCS file: /cvs/ports/x11/freerdp/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- x11/freerdp/distinfo6 May 2017 15:10:18 - 1.7 +++ x11/freerdp/distinfo14 Jan 2018 08:14:58 - @@ -1,2 +1,2 @@ -SHA256 (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = /LC7jfaSVy4Bmye9sljZvhOW/pOAerJ3Ld4vC7JqxVY= -SIZE (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 6036392 +SHA256 (freerdp-2.0.0rc1.tar.gz) = osHIMHJInVbaeLvnbClykCL1w1o+w6HOJs6ogj3gQ8I= +SIZE (freerdp-2.0.0rc1.tar.gz) = 6530403 Index: x11/freerdp/patches/patch-CMakeLists_txt === RCS file: x11/freerdp/patches/patch-CMakeLists_txt diff -N x11/freerdp/patches/patch-CMakeLists_txt --- x11/freerdp/patches/patch-CMakeLists_txt7 Nov 2015
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On 2018/01/13 20:02, Sebastien Marie wrote:
> On Sat, Jan 13, 2018 at 02:00:50PM +, Stuart Henderson wrote:
> > On 2018/01/13 14:11, Sebastien Marie wrote:
> > > I didn't check RUN_DEPENDS, as I didn't expect command-line change.
> >
> > I wouldn't put it past them to chage command-line again ;)
OK, I've compared the help output from old and new, diff is a bit hard
to read but it seems pretty close so I don't think there will be a problem.
> > > +WANTLIB += ossaudio
> >
> > I don't _think_ we don't want that.. -DWITH_OSS=OFF ?
>
> I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see
> client/common/CMakeLists.txt file). I did few tests, but I couldn't get
> audio (with or without using ossaudio).
There was a big effort to remove ossaudio across as much of the ports
tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem
to be used for anything here and isn't required to build, so I think we
should just patch it away.
--snip -- --- -- --- -- ---
Index: client/common/CMakeLists.txt
--- client/common/CMakeLists.txt.orig
+++ client/common/CMakeLists.txt
@@ -66,11 +66,7 @@ endif()
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr)
target_link_libraries(${MODULE_NAME} ${PRIVATE_KEYWORD}
${FREERDP_CHANNELS_CLIENT_LIBS})
-if(OPENBSD)
- target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD}
${${MODULE_PREFIX}_LIBS} ossaudio)
-else()
- target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD}
${${MODULE_PREFIX}_LIBS})
-endif()
+target_link_libraries(${MODULE_NAME} ${PUBLIC_KEYWORD}
${${MODULE_PREFIX}_LIBS})
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT
libraries EXPORT FreeRDP-ClientTargets)
--snip -- --- -- --- -- ---
It might not be all that hard to port to sndio, if somebody actually
wants audio over this..
> I fuck myself with cvs... sorry about that.
>
> diff regenerated.
No worries :)
xfreerdp itself still works for me.
remmina needs cvs rm patch-* then it builds, but doesn't work
properly for me (displays the window, but doesn't do anything if
I enter a hostname and try to connect).
I haven't tried vinagre.
Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)
On 2018/01/13 14:11, Sebastien Marie wrote: > I didn't check RUN_DEPENDS, as I didn't expect command-line change. I wouldn't put it past them to chage command-line again ;) > +WANTLIB += ossaudio I don't _think_ we don't want that.. -DWITH_OSS=OFF ? Build fails for me, it tries to use -lrt. FAILED: client/X11/xfreerdp : && /usr/local/bin/ccache /usr/obj/ports/freerdp-2.0.0rc1/bin/cc -O2 -pipe -I/usr/X11R6/include -I/usr/local/include -Wno-unused-parameter -Wno-unused-macros -Wno-padded -Wno-c11-extensions -Wno-gnu -Wno-unused-command-line-argument -Wno-deprecated-declarations -DNDEBUG client/X11/CMakeFiles/xfreerdp-client.dir/xf_gdi.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_gfx.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_rail.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_tsmf.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_input.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_event.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_channels.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_cliprdr.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_monitor.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_graphics.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_keyboard.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_window.c.o client/X11/CMakeFiles/xfreerdp-client.dir/xf_client.c.o client/X11/CMakeFiles/xfreerdp-client.dir/cli/xfreerdp.c.o -o client/X11/xfreerdp -L/usr/local/lib -L/usr/X11R6/lib -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp -L/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr -Wl,-rpath,/usr/local/lib:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/client/common:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/libfreerdp:/usr/obj/ports/freerdp-2.0.0rc1/build-amd64/winpr/libwinpr: -lX11 -lXinerama -lXext -lXcursor -lXv -lXi -lXrender -lXfixes -lfreerdp-client2 -lfreerdp2 -lm -lrt -lwinpr2 -lossaudio -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && : /usr/bin/ld: cannot find -lrt
