August 2019 - CRUX - lists.crux.nu

ports/contrib (3.5): [notify] ddclient: 3.8.1 -> 3.9.0 new dependencies: p5-io-socket-inet6 p5-digest-sha1 p5-data-validate-ip
by crux＠crux.nu 31 Aug '19

31 Aug '19

commit ec9f4447d35a39aea3a4a5c11ba2bc1cfa611b82 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 12:40:40 2019 +1000 [notify] ddclient: 3.8.1 -> 3.9.0 new dependencies: p5-io-socket-inet6 p5-digest-sha1 p5-data-validate-ip diff --git a/ddclient/.signature b/ddclient/.signature index 745aa997..2fcb7448 100644 --- a/ddclient/.signature +++ b/ddclient/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36QNgQ5fqIxIMQiN/FP/bww/2fleWnb2Bpc17pftmWR53Q1gp/056GQFSU6PXjhB6L9GQJdIl57wTBnPjR0Spw8= -SHA256 (Pkgfile) = ec27086aabacdb1eb812441d4854d2d18c1feecffbd112c96fb2572b07d630c1 +RWSagIOpLGJF30rbP6K5ulbu64lw+V5mZZSsjBEZp1cBCq1cJXVFfaugAOj7vOIWPRvcx8N5A8cHRxWqFobKZ4NWvHDP8vJU1A8= +SHA256 (Pkgfile) = cede46ef1e3a8daa4dd13e5ed72eb8a590a4ded265bd427aa0403a34d3f10cdc SHA256 (.footprint) = 9d888cc14a2f6e9a90d80e360e3963cce73ae32aeb5caedb759b6846a452fe9a -SHA256 (ddclient-3.8.1.tar.bz2) = 77a82668a53fdbed1e05ad6febe6dbefb093e3922afb20b993d4ad9ee868258f +SHA256 (ddclient-v3.9.0.tar.gz) = 9c4ae902742e8a37790d3cc8fad4e5b0f38154c76bba3643f4423d8f96829e3b SHA256 (ddclient.rc) = c80b3ede788eb0b45f0f27441271351486136b397d78d380e4e3eb91bb3b8aba diff --git a/ddclient/Pkgfile b/ddclient/Pkgfile index 7c840ee8..0747f434 100644 --- a/ddclient/Pkgfile +++ b/ddclient/Pkgfile @@ -1,20 +1,19 @@ # Description: Utility for maintaining your dynamic DNS entries. -# URL: http://ddclient.wiki.sourceforge.net/ +# URL: https://github.com/ddclient/ddclient # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Jay Dolan, jdolan at jdolan dot dyndns dot org -# Depends on: p5-io-socket-ssl +# Depends on: p5-io-socket-ssl p5-io-socket-inet6 p5-digest-sha1 p5-data-validate-ip name=ddclient -version=3.8.1 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version/$name-$version.tar.bz2 +version=3.9.0 +release=1 +source=(https://github.com/ddclient/ddclient/archive/v$version/$name-v$version.tar.gz ddclient.rc) build() { - cd ddclient-$version + cd $name-$version sed -i -e 's|/etc/ddclient/|/etc/|' ddclient install -d $PKG/var/cache/ddclient install -D -m 0755 ddclient $PKG/usr/sbin/ddclient - install -D -m 0755 ../ddclient.rc $PKG/etc/rc.d/ddclient + install -D -m 0755 $SRC/ddclient.rc $PKG/etc/rc.d/ddclient install -D -m 0600 sample-etc_ddclient.conf $PKG/etc/ddclient.conf }

1 0

mpv for wayland
by Cédric 30 Aug '19

30 Aug '19

Hello, I'm testing the window manager sway for wayland. I would like to watch some videos with mpv unfortunately it doesn't work. I'm trying to run mpv as a native application for wayland, I don't use xwayland. With Xorg, mpv works fine. What I did so far: - I modified the port for libva by removin "--disable-wayland" - I patched "libva-intel" with this patch https://git.archlinux.org/svntogit/packages.git/tree/trunk/427.patch?h=pack… My mpv configuration: ------------------------------- $ mpv -v [cplayer] Command line options: '-v' [cplayer] mpv 0.29.1 Copyright © 2000-2018 mpv/MPlayer/mplayer2 projects [cplayer] built on Tue Aug 20 09:59:24 CEST 2019 [cplayer] ffmpeg library versions: [cplayer] libavutil 56.31.100 [cplayer] libavcodec 58.54.100 [cplayer] libavformat 58.29.100 [cplayer] libswscale 5.5.100 [cplayer] libavfilter 7.57.100 [cplayer] libswresample 3.5.100 [cplayer] ffmpeg version: 4.2 [cplayer] [cplayer] Configuration: ./waf configure --prefix=/usr --enable-libarchive --enable-wayland --enable-gl-wayland --enable-libmpv-shared -j 8 [cplayer] List of enabled features: alsa asm atomics build-date cplayer cplugins debug-build drm drmprime egl-drm egl-helpers egl-x11 fchmod ffmpeg gbm gbm.h gl gl-wayland gl-x11 glibc-thread-name glob glob-posix gnuc gpl iconv jpeg lcms2 libaf libarchive libass libass-osd libav-any libavcodec libavdevice libdl libm libmpv-shared librt linux-fstatfs lua luajit optimize oss-audio plain-gl posix posix-or-mingw posix-spawn posix-spawn-native pthreads stdatomic vaapi vaapi-drm vaapi-egl vaapi-glx vaapi-wayland vaapi-x-egl vaapi-x11 vdpau vdpau-gl-x11 vt.h wayland wayland-protocols x11 xv zlib [cplayer] Reading config file /usr/etc/mpv/encoding-profiles.conf [cplayer] mpv 0.29.1 Copyright © 2000-2018 mpv/MPlayer/mplayer2 projects [cplayer] built on Tue Aug 20 09:59:24 CEST 2019 [cplayer] ffmpeg library versions: [cplayer] libavutil 56.31.100 [cplayer] libavcodec 58.54.100 [cplayer] libavformat 58.29.100 [cplayer] libswscale 5.5.100 [cplayer] libavfilter 7.57.100 [cplayer] libswresample 3.5.100 [cplayer] ffmpeg version: 4.2 [cplayer] [cplayer] Usage: mpv [options] [url|path/]filename [cplayer] [cplayer] Basic options: [cplayer] --start=<time> seek to given (percent, seconds, or hh:mm:ss) position [cplayer] --no-audio do not play sound [cplayer] --no-video do not play video [cplayer] --fs fullscreen playback [cplayer] --sub-file=<file> specify subtitle file to use [cplayer] --playlist=<file> specify playlist file [cplayer] [cplayer] --list-options list all mpv options [cplayer] --h=<string> print options which contain the given string in their name [cplayer] [ytdl_hook] script-opts/ytdl_hook.conf not found. [ytdl_hook] lua-settings/ytdl_hook.conf not found. [stats] script-opts/stats.conf not found. [stats] lua-settings/stats.conf not found. [ytdl_hook] Exiting... [stats] Exiting... [osc] script-opts/osc.conf not found. [osc] lua-settings/osc.conf not found. [osc] Exiting... -------------------------------------------- First try to play a video (just tell me if you need the entire log): -------------------------------- $ mpv -v --vo=drm --gpu-context=wayland When\ not\ knowing\ Math\ can\ cost\ you\ \$15\,000-BbX44YSsQ2I.mkv . . . demux] Detected file format: Matroska [cplayer] Opening done: When not knowing Math can cost you $15,000-BbX44YSsQ2I.mkv [find_files] Loading external files in . [cplayer] Running hook: ytdl_hook/on_preloaded [mkv] select track 0 [mkv] select track 1 [cplayer] (+) Video --vid=1 (*) (h264 320x240 11.988fps) [cplayer] (+) Audio --aid=1 --alang=eng (*) (opus 2ch 48000Hz) [vo/drm] VT_GETMODE failed: Inappropriate ioctl for device [vo/drm] Failed to set up VT switcher. Terminal switching will be unavailable. [osd/libass] Using font provider fontconfig [osd/libass] Done. [vo/drm/kms] Connector 71 currently connected to encoder 70 [vo/drm/kms] Selected Encoder 70 with CRTC 41 [vo/drm] DRM Atomic support found [vo/drm/kms] Using default plane 28 for OSD [vo/drm/kms] Using default plane 33 for video [vo/drm] Cannot set CRTC: Permission denied [cplayer] Error opening/initializing the selected video_out (--vo) device. [mkv] deselect track 0 [cplayer] Video: no video [ad] Codec list: . . . ------------------------------------- Second try: ------------------------ $ mpv -v --vo=gpu --gpu-context=wayland When\ not\ knowing\ Math\ can\ cost\ you\ \$15\,000-BbX44YSsQ2I.mkv . . . cplayer] Running hook: ytdl_hook/on_preloaded [mkv] select track 0 [mkv] select track 1 [cplayer] (+) Video --vid=1 (*) (h264 320x240 11.988fps) [cplayer] (+) Audio --aid=1 --alang=eng (*) (opus 2ch 48000Hz) [vo/gpu/opengl] Initializing GPU context 'wayland' [vo/gpu/wayland] Registered for protocol wl_shm [vo/gpu] Enabling event driven renderloop! [vo/gpu/wayland] Registered for protocol wl_compositor [vo/gpu/wayland] Registered for protocol wl_data_device_manager [vo/gpu/wayland] Registered for protocol zwp_idle_inhibit_manager_v1 [vo/gpu/wayland] Registered for protocol xdg_wm_base [vo/gpu/wayland] Registered for protocol org_kde_kwin_server_decoration_manager [vo/gpu/wayland] Registered for protocol wl_seat [vo/gpu/wayland] Registered for protocol wl_output [vo/gpu/wayland] Enabling server decorations [osd/libass] Using font provider fontconfig [osd/libass] Done. [vo/gpu] Failed initializing any suitable GPU context! [cplayer] Error opening/initializing the selected video_out (--vo) device. [mkv] deselect track 0 [cplayer] Video: no video [ad] Codec list: . . . ---------------------------------- Does anybody have an idea ? Thank you !

2 5

ports/compat-32 (3.5): [notify] vulkan-validation-layers-32: add build jobs, added deps: spirv-tools-32 glslang removed: glslang-32
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit fa8b0976aad510c34dcd8b0f7df2b9298bf56b00 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:02:35 2019 +1000 [notify] vulkan-validation-layers-32: add build jobs, added deps: spirv-tools-32 glslang removed: glslang-32 diff --git a/vulkan-validation-layers-32/.signature b/vulkan-validation-layers-32/.signature index 89e7323..aadea0c 100644 --- a/vulkan-validation-layers-32/.signature +++ b/vulkan-validation-layers-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXThO16l1OVdaZCIDzdc3wwEBkx8itw9SwTY0rYdFhXubRgcNiT0U46Qpya8hITgCMCU/Vr6JKYNFBGH2125qcw8= -SHA256 (Pkgfile) = 7bb0b5dc7923804523bbeb60b77de4d53b808bcd50b966533bdd3d4fa0cca038 +RWSwxGo/zH7eXaitYo9BAc4UbJc8jOwfbVKJ8T7T6aFncwDirzcSrnYs3IDtOEL7MLbM2B1+MX2tOSeec4GaquqgGK2EirNfoQc= +SHA256 (Pkgfile) = a268b6fa1661ca1a075b104db967b6d98a86896fa7a0684a1e5ff74529b590aa SHA256 (.footprint) = a3c7b208aceb77f2d83a5e706f9ef3b951e047be12e9cd17dbfa14123cf91cba SHA256 (Vulkan-ValidationLayers-sdk-1.1.114.0.tar.gz) = b1634aea4cc130b1fcbeea576e65a17c40daf4fa8b1eaafbc6c36e447aa2344e diff --git a/vulkan-validation-layers-32/Pkgfile b/vulkan-validation-layers-32/Pkgfile index 2840cf9..b0dc552 100644 --- a/vulkan-validation-layers-32/Pkgfile +++ b/vulkan-validation-layers-32/Pkgfile @@ -1,7 +1,7 @@ # Description: Vulkan validation layers, 32bit # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang-32 vulkan-loader-32 vulkan-validation-layers +# Depends on: spirv-tools-32 vulkan-loader-32 vulkan-validation-layers name=vulkan-validation-layers-32 version=1.1.114.0 @@ -28,7 +28,7 @@ build() { -DBUILD_WSI_WAYLAND_SUPPORT=OFF \ -GNinja - ninja + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install rm -r $PKG/usr/{include,share}

1 0

ports/compat-32 (3.5): [notify] vulkan-tools-32: add build jobs, change dependency glslang-32 -> glslang
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit a507a4ea86799e576403952682608729789956cb Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 01:01:10 2019 +1000 [notify] vulkan-tools-32: add build jobs, change dependency glslang-32 -> glslang diff --git a/vulkan-tools-32/.signature b/vulkan-tools-32/.signature index 44c6bdd..aa0734f 100644 --- a/vulkan-tools-32/.signature +++ b/vulkan-tools-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXTAI7sAcSo68OWyF7Whvq7axVPUELf0DkoHfWVtnlaSfMjXx7uVUwWXbaZgESIu0sgFhPlfPtsYrChY8v7do4QE= -SHA256 (Pkgfile) = 00c415bf917aa12dc1b9646564ae24d8978eb86aaca46e1339f9c700711b76a8 +RWSwxGo/zH7eXd2bSsMOxSpGzPvSCfHRVyJu0jjDbvTX5Pa2Jx9Yvgq/Z+umy7HKXcbfjr2T4Z7FnYsyCiAfUbNl4IA4gzqkdQo= +SHA256 (Pkgfile) = 23559044b76935a4433219a866d835d1fc7da6937e93dc758f38a6e5c21fe86f SHA256 (.footprint) = 87637197eea1098d4b7b48a2c38eaf7d6a306005fb53696ed5fb268190daf397 SHA256 (Vulkan-Tools-sdk-1.1.114.0.tar.gz) = 7310390143479d633abac152f08220448a458598e04d8c8c3ff354abb93d1184 diff --git a/vulkan-tools-32/Pkgfile b/vulkan-tools-32/Pkgfile index ce984fb..2048868 100644 --- a/vulkan-tools-32/Pkgfile +++ b/vulkan-tools-32/Pkgfile @@ -1,7 +1,7 @@ # Description: Vulkan tools # URL: https://www.khronos.org/vulkan/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang-32 vulkan-loader-32 +# Depends on: glslang vulkan-loader-32 name=vulkan-tools-32 version=1.1.114.0 @@ -30,7 +30,7 @@ build() { -DBUILD_ICD=OFF \ -GNinja - ninja + ninja -j ${JOBS:-1} DESTDIR=$PKG ninja install for app in $PKG/usr/bin/* ; do

1 0

ports/compat-32 (3.5): [notify] glslang-32: dropped, not required
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 8a28a9337f85ce9edb90a9810f81a55e9be5a8ae Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 31 00:57:52 2019 +1000 [notify] glslang-32: dropped, not required diff --git a/glslang-32/.32bit b/glslang-32/.32bit deleted file mode 100644 index e69de29..0000000 diff --git a/glslang-32/.footprint b/glslang-32/.footprint deleted file mode 100644 index 561e638..0000000 --- a/glslang-32/.footprint +++ /dev/null @@ -1,18 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib32/ --rw-r--r-- root/root usr/lib32/libHLSL.a --rwxr-xr-x root/root usr/lib32/libHLSL.so -lrwxrwxrwx root/root usr/lib32/libHLSL.so.0 -> libHLSL.so --rw-r--r-- root/root usr/lib32/libOGLCompiler.a --rw-r--r-- root/root usr/lib32/libOSDependent.a --rw-r--r-- root/root usr/lib32/libSPIRV.a --rwxr-xr-x root/root usr/lib32/libSPIRV.so -lrwxrwxrwx root/root usr/lib32/libSPIRV.so.0 -> libSPIRV.so --rw-r--r-- root/root usr/lib32/libSPVRemapper.a --rwxr-xr-x root/root usr/lib32/libSPVRemapper.so -lrwxrwxrwx root/root usr/lib32/libSPVRemapper.so.0 -> libSPVRemapper.so --rwxr-xr-x root/root usr/lib32/libglslang-default-resource-limits.so -lrwxrwxrwx root/root usr/lib32/libglslang-default-resource-limits.so.0 -> libglslang-default-resource-limits.so --rw-r--r-- root/root usr/lib32/libglslang.a --rwxr-xr-x root/root usr/lib32/libglslang.so -lrwxrwxrwx root/root usr/lib32/libglslang.so.0 -> libglslang.so diff --git a/glslang-32/.signature b/glslang-32/.signature deleted file mode 100644 index 0ebe2c8..0000000 --- a/glslang-32/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXduui1p/vktONppv0YkQJwCQDU0xWjAgwo36+ae22ohUmQTLsdwIQ00REKJeUXnDud9Sg+h+HdEM/XmeScO2qwE= -SHA256 (Pkgfile) = 2d5f0f314493aaea694a1551babd2a41c4a2508cb18d352e5791ce693bc0c2d8 -SHA256 (.footprint) = 3ec5fe7cd3621d51f5b2c04fd168dfadd8aa60b4e2f4cb37b37d661ea8a7551a -SHA256 (glslang-7.12.3352.tar.gz) = 4ecce011b73dd7196a5114f66776d5a4c4c3674fc9bc6f39ad3c1ee15a8abbe1 -SHA256 (0001-pkg-config-compatibility.patch) = efd22887303f1c6cdaacd31d6049438502bc7d699859fd501d075b8ab6f3ae42 diff --git a/glslang-32/0001-pkg-config-compatibility.patch b/glslang-32/0001-pkg-config-compatibility.patch deleted file mode 100644 index 38592ff..0000000 --- a/glslang-32/0001-pkg-config-compatibility.patch +++ /dev/null @@ -1,225 +0,0 @@ -https://src.fedoraproject.org/rpms/glslang/raw/master/f/0001-pkg-config-compatibility.patch -https://src.fedoraproject.org/rpms/glslang/tree/master -https://github.com/KhronosGroup/glslang/pull/1621 - -From d2a8230cc05d77dad82a60329881244814797e4c Mon Sep 17 00:00:00 2001 -From: Rafael Amador Galvan <rafael.amador(a)gmail.com> -Date: Fri, 8 Mar 2019 11:39:58 -0600 -Subject: [PATCH 1/2] pkg-config compatibility - ---- - CMakeLists.txt | 13 ++++++++----- - SPIRV/CMakeLists.txt | 19 +++++++++++++++++-- - SPIRV/SpvTools.cpp | 4 ++-- - SPIRV/spirv.pc.cmake.in | 11 +++++++++++ - StandAlone/CMakeLists.txt | 9 ++++++++- - glslang/CMakeLists.txt | 3 +++ - glslang/glslang.pc.cmake.in | 11 +++++++++++ - 7 files changed, 60 insertions(+), 10 deletions(-) - create mode 100644 SPIRV/spirv.pc.cmake.in - create mode 100644 glslang/glslang.pc.cmake.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aafa70ed1..21ecef08d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,13 @@ macro(glslang_pch SRCS PCHCPP) - endmacro(glslang_pch) - - project(glslang) -+ -+# using pkg-config to configure include paths and link libraries -+include(FindPkgConfig) -+pkg_check_modules(SPIRV_TOOLS REQUIRED SPIRV-Tools>=2019.2.1) -+if(BUILD_SHARED_LIBS) -+ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1) -+endif(BUILD_SHARED_LIBS) - # make testing optional - include(CTest) - -@@ -117,11 +124,7 @@ endfunction(glslang_set_link_args) - # We depend on these for later projects, so they should come first. - add_subdirectory(External) - --if(NOT TARGET SPIRV-Tools-opt) -- set(ENABLE_OPT OFF) --endif() -- --if(ENABLE_OPT) -+if(${SPIRV_TOOLS_FOUND} EQUAL 1) - message(STATUS "optimizer enabled") - add_definitions(-DENABLE_OPT=1) - else() -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 1997e74c3..1760a065b 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -48,6 +48,10 @@ set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(SPIRV PUBLIC ..) - -+ -+set(SPIRV_NAME spirv) -+set(SPIRV_VERSION 1.3) -+ - if (ENABLE_SPVREMAPPER) - add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) - set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -@@ -61,13 +65,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - endif() - -+target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) -+target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_CFLAGS_OTHER}) -+target_link_libraries(SPIRV ${SPIRV_TOOLS_LIBRARIES}) -+if(BUILD_SHARED_LIBS) -+ target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) -+ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER}) -+ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES}) -+endif(BUILD_SHARED_LIBS) -+ - if(ENABLE_OPT) - target_include_directories(SPIRV - PRIVATE ${spirv-tools_SOURCE_DIR}/include - PRIVATE ${spirv-tools_SOURCE_DIR}/source - ) -- target_link_libraries(SPIRV glslang SPIRV-Tools-opt) -- target_include_directories(SPIRV PUBLIC ../External) -+ target_link_libraries(SPIRV glslang) - else() - target_link_libraries(SPIRV glslang) - endif(ENABLE_OPT) -@@ -96,5 +108,8 @@ if(ENABLE_GLSLANG_INSTALL) - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -+ # spirv.pc Configuration -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SPIRV/) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp -index eec06e0ac..723a64452 100644 ---- a/SPIRV/SpvTools.cpp -+++ b/SPIRV/SpvTools.cpp -@@ -43,8 +43,8 @@ - #include <iostream> - - #include "SpvTools.h" --#include "spirv-tools/optimizer.hpp" --#include "spirv-tools/libspirv.h" -+#include <spirv-tools/optimizer.hpp> -+#include <spirv-tools/libspirv.h> - - namespace glslang { - -diff --git a/SPIRV/spirv.pc.cmake.in b/SPIRV/spirv.pc.cmake.in -new file mode 100644 -index 000000000..dfcad940b ---- /dev/null -+++ b/SPIRV/spirv.pc.cmake.in -@@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @SPIRV_NAME@ -+ Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan -+ Requires: -+ Version: @SPIRV_VERSION@ -+ Libs: -L${libdir} -lSPIRV -+ Cflags: -I${includedir} -\ No newline at end of file -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 5cea53d9f..89a7da9c4 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -23,6 +23,14 @@ set(LIBRARIES - SPVRemapper - glslang-default-resource-limits) - -+if(BUILD_SHARED_LIBS) -+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) -+else() -+ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES}) -+ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) -+endif(BUILD_SHARED_LIBS) -+ - if(WIN32) - set(LIBRARIES ${LIBRARIES} psapi) - elseif(UNIX) -@@ -33,7 +41,6 @@ endif(WIN32) - - target_link_libraries(glslangValidator ${LIBRARIES}) - target_link_libraries(spirv-remap ${LIBRARIES}) --target_include_directories(glslangValidator PUBLIC ../External) - - if(WIN32) - source_group("Source" FILES ${SOURCES}) -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 5f51476ba..daf717fab 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -80,6 +80,7 @@ set(HEADERS - # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - # set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) - -+set(VERSION 7.11.3113) - glslang_pch(SOURCES MachineIndependent/pch.cpp) - - add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -@@ -113,6 +114,8 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS glslang - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif(ENABLE_GLSLANG_INSTALL) - - if(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in -new file mode 100644 -index 000000000..921497eb6 ---- /dev/null -+++ b/glslang/glslang.pc.cmake.in -@@ -0,0 +1,11 @@ -+ prefix=@CMAKE_INSTALL_PREFIX@ -+ exec_prefix=@CMAKE_INSTALL_PREFIX@ -+ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+ -+ Name: @PROJECT_NAME@ -+ Description: OpenGL and OpenGL ES shader front end and validator -+ Requires: -+ Version: @VERSION@ -+ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -+ Cflags: -I${includedir} -\ No newline at end of file - -From 0ebd323091567c65be3f2831a3bcac6223b0aa52 Mon Sep 17 00:00:00 2001 -From: Rafael Amador Galvan <rafael.amador(a)gmail.com> -Date: Fri, 8 Mar 2019 11:50:49 -0600 -Subject: [PATCH 2/2] removed the section belonging to the SPIRV-Tools - dependency - ---- - External/CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt -index 4d9690134..24f03237a 100644 ---- a/External/CMakeLists.txt -+++ b/External/CMakeLists.txt -@@ -34,10 +34,3 @@ if(BUILD_TESTING) - endif() - endif() - --if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) -- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) -- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") -- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) -- endif() --endif() -- diff --git a/glslang-32/Pkgfile b/glslang-32/Pkgfile deleted file mode 100644 index 609021c..0000000 --- a/glslang-32/Pkgfile +++ /dev/null @@ -1,49 +0,0 @@ -# Description: Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator -# URL: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler -# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu -# Depends on: glslang spirv-tools-32 - -name=glslang-32 -version=7.12.3352 -release=1 -source=(https://github.com/KhronosGroup/glslang/archive/$version/${name%-*}-$version.tar.gz - 0001-pkg-config-compatibility.patch) - -build() { - cd ${name%-*}-$version - - # Patch to build against system spirv-tools - patch -p1 -i $SRC/0001-pkg-config-compatibility.patch - - mkdir -p build-{shared,static} - - (cd build-shared - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=ON - ninja - ) - - (cd build-static - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib32 \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=OFF - ninja - ) - - DESTDIR=$PKG ninja -C build-shared install - DESTDIR=$PKG ninja -C build-static install - - cd $PKG/usr/lib32 - for lib in *.so; do - ln -sf "${lib}" "${lib}.0" - done - - rm -r $PKG/usr/{bin,include} -}

1 0

ports/contrib (3.5): [notify] thunderbird: 60.8.0 -> 68.0 new dependencies: cbindgen clang nodejs
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit dd2f73f86fc3613efee624e69f18b543b3da12b7 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Aug 30 23:29:03 2019 +1000 [notify] thunderbird: 60.8.0 -> 68.0 new dependencies: cbindgen clang nodejs diff --git a/thunderbird/.footprint b/thunderbird/.footprint index 155f0c66..174605f4 100644 --- a/thunderbird/.footprint +++ b/thunderbird/.footprint @@ -23,18 +23,13 @@ drwxr-xr-x root/root usr/lib/thunderbird/defaults/messenger/ drwxr-xr-x root/root usr/lib/thunderbird/defaults/pref/ -rw-r--r-- root/root usr/lib/thunderbird/defaults/pref/channel-prefs.js -rw-r--r-- root/root usr/lib/thunderbird/dependentlibs.list -drwxr-xr-x root/root usr/lib/thunderbird/dictionaries/ --rw-r--r-- root/root usr/lib/thunderbird/dictionaries/en-US.aff --rw-r--r-- root/root usr/lib/thunderbird/dictionaries/en-US.dic drwxr-xr-x root/root usr/lib/thunderbird/distribution/ drwxr-xr-x root/root usr/lib/thunderbird/distribution/extensions/ -rw-r--r-- root/root usr/lib/thunderbird/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi -drwxr-xr-x root/root usr/lib/thunderbird/extensions/ --rw-r--r-- root/root usr/lib/thunderbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi drwxr-xr-x root/root usr/lib/thunderbird/features/ -rw-r--r-- root/root usr/lib/thunderbird/features/wetransfer(a)extensions.thunderbird.net.xpi drwxr-xr-x root/root usr/lib/thunderbird/fonts/ --rw-r--r-- root/root usr/lib/thunderbird/fonts/EmojiOneMozilla.ttf +-rw-r--r-- root/root usr/lib/thunderbird/fonts/TwemojiMozilla.ttf drwxr-xr-x root/root usr/lib/thunderbird/gtk2/ -rwxr-xr-x root/root usr/lib/thunderbird/gtk2/libmozgtk.so drwxr-xr-x root/root usr/lib/thunderbird/isp/ diff --git a/thunderbird/.signature b/thunderbird/.signature index 80c133d5..07098f8a 100644 --- a/thunderbird/.signature +++ b/thunderbird/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35w4nWUhCvW7bL1Hl4/eZwxUmwD31b/wbkqitDxATQy0fDUHor8a6eyPA6grke7+xCUUo+xP+jpIRERiPdeWcgk= -SHA256 (Pkgfile) = e92a08b6f74ccd203fc66986034f36ce77050f695cbb8aa0c51c6a7143010076 -SHA256 (.footprint) = 42a88545775e207a9d590a342e94721967f77114a2e72c79a92cf7cafd750cf0 -SHA256 (thunderbird-60.8.0.source.tar.xz) = 1e7a13e64b63476d2235aaac6823fdab949af45cfcd5a25ee710cbae08c2f5d1 +RWSagIOpLGJF32PEFp2jDpJwdlfQYMD3bOcC/wa2gMKAEgQEyZY2KJZPHkKnJuCALVMLMO3O/BuQW2afpVsA6Ym1NE0pCxqQng8= +SHA256 (Pkgfile) = cc6459fbdef9701f0a181580f0afc236dccef25b55e6f9648c7858e9b88926d1 +SHA256 (.footprint) = 345c06ea7ab2e90fe32c0a85a09dab8dc14485da0967bae3951c1052e3629b4c +SHA256 (thunderbird-68.0.source.tar.xz) = f87dade2dd64ef61de842812d3e42d82b8a541988da851077778abfa2ebd95d1 SHA256 (thunderbird.desktop) = c6bc6a66f16951c4f7560d019dad48968169aef6587cef4e98380a300078299a diff --git a/thunderbird/Pkgfile b/thunderbird/Pkgfile index 70c5829d..5db75b9b 100644 --- a/thunderbird/Pkgfile +++ b/thunderbird/Pkgfile @@ -1,11 +1,11 @@ # Description: Email client from the Mozilla project # URL: https://www.thunderbird.net/en-US/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: alsa-lib autoconf-2.13 gtk gtk3 libidl nss rust unzip util-linux xorg-libxt yasm zip +# Depends on: alsa-lib autoconf-2.13 cbindgen clang gtk gtk3 libidl nss unzip xorg-libxt yasm zip nodejs # Optional: sccache name=thunderbird -version=60.8.0 +version=68.0 release=1 source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$na… $name.desktop) @@ -31,7 +31,6 @@ cat <<- EOF > .mozconfig #breaks search: #ac_add_options --enable-system-sqlite ac_add_options --enable-alsa - ac_add_options --with-pthreads ac_add_options --enable-official-branding ac_add_options --with-distribution-id=nu.crux ac_add_options --disable-tests @@ -43,9 +42,9 @@ cat <<- EOF > .mozconfig ac_add_options --disable-pulseaudio ac_add_options --disable-gconf ac_add_options --enable-calendar - ac_add_options --disable-stylo EOF + export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib export MOZ_MAKE_FLAGS="-j ${JOBS-1}" export MOZBUILD_STATE_PATH="$PKGMK_SOURCE_DIR/.mozbuild"

1 0

ports/opt (3.5): [notify] irssi: update to 1.2.2
by crux＠crux.nu 30 Aug '19

30 Aug '19

commit 50e886372d704aa2e28b2b37cf434d48edefb43b Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 30 15:24:55 2019 +0200 [notify] irssi: update to 1.2.2 security fix, see https://irssi.org/security/irssi_sa_2019_08.txt diff --git a/irssi/.signature b/irssi/.signature index a017a5ca7..bc57dd081 100644 --- a/irssi/.signature +++ b/irssi/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YM6OfS4Dv1HsRtX4WOAb9gIFFp1Eo3y66yS7Xs2QGGsky1/bo1TzBy4nb74ZiIf4BXJ7hhE+dP/+PFzcsa5/QA= -SHA256 (Pkgfile) = 89f50ff6c9bb932fac2e00b354945bf74f5762a8458aa6e561e9557174ad8eac +RWSE3ohX2g5d/WheJ4uhmM70ZQtSMGHIhtokpsUXP3nhrvvzWli2mBbqetOmYOsEF2HFa2k/qpxrB6cSfYemZ+X9+BatPHbDhAw= +SHA256 (Pkgfile) = f7507228e564179fdb54cea6c43012820af1ecd9f5480c76928153c547c68fac SHA256 (.footprint) = 5129f4f7464bf8dd66d81be3bed82a3d0c7a965e6861e6c863d4bda7905bd5f5 -SHA256 (irssi-1.2.1.tar.xz) = 5466a1ed9612cfa707d9a37d60b29d027b4ac7d83c74ceb1a410e2b59edba92c +SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 diff --git a/irssi/Pkgfile b/irssi/Pkgfile index 9caeaa84e..4f32ac240 100644 --- a/irssi/Pkgfile +++ b/irssi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: glib name=irssi -version=1.2.1 +version=1.2.2 release=1 source=(https://github.com/irssi-import/irssi/releases/download/$version/$n…

1 0

Re: Problem in building iso image
by wyatt＠prairieturtle.ca 29 Aug '19

29 Aug '19

Don't know if this is your case but is /mnt the ISO file? It would be read-only. Run mount /mnt and ensure kernel is building on a R/W filesystem. -Daryl ----- Reply message ----- From: "Wawrzek Niewodniczanski" <main(a)wawrzek.name> To: "crux" <crux(a)lists.crux.nu> Subject: Problem in building iso image Date: Wed, Aug 28, 2019 12:45 I try to build an iso image from release 3.5 branch and get following error. What's wrong? bash-4.4# make kernel make -C kernel/linux-4.19.61 mrproper make[1]: Entering directory '/mnt/kernel/linux-4.19.61' make[2]: *** Documentation/Kbuild: Is a directory. Stop. make[1]: *** [Makefile:1316: _clean_Documentation] Error 2 make[1]: Leaving directory '/mnt/kernel/linux-4.19.61' make: *** [Makefile:98: kernel/linux-4.19.61/arch/x86/boot/bzImage] Error 2 Wawrzek PS. Is it correct that master points on Crux 3.4 release? -- Dr Wawrzyniec Niewodniczański or Wawrzek for short PhD in Quantum Chemistry & MSc in Molecular Engineering WWW: http://wawrzek.name E-MAIL: jobs(a)wawrzek.name Linux User #177124 _______________________________________________ CRUX mailing list CRUX(a)lists.crux.nu https://lists.crux.nu/mailman/listinfo/crux

2 2

Crux and docker
by Wawrzek Niewodniczanski 29 Aug '19

29 Aug '19

Hi, I wonder if there are any materials on how to use Crux docker image. I'm especially interested in preparing the ISO image in it. Wawrzek PS. Who can bump docker version to 3.5? -- Dr Wawrzyniec Niewodniczański or Wawrzek for short PhD in Quantum Chemistry & MSc in Molecular Engineering WWW: http://wawrzek.name E-MAIL: jobs(a)wawrzek.name Linux User #177124

2 2

Problem in building iso image
by Wawrzek Niewodniczanski 28 Aug '19

28 Aug '19

I try to build an iso image from release 3.5 branch and get following error. What's wrong? bash-4.4# make kernel make -C kernel/linux-4.19.61 mrproper make[1]: Entering directory '/mnt/kernel/linux-4.19.61' make[2]: *** Documentation/Kbuild: Is a directory. Stop. make[1]: *** [Makefile:1316: _clean_Documentation] Error 2 make[1]: Leaving directory '/mnt/kernel/linux-4.19.61' make: *** [Makefile:98: kernel/linux-4.19.61/arch/x86/boot/bzImage] Error 2 Wawrzek PS. Is it correct that master points on Crux 3.4 release? -- Dr Wawrzyniec Niewodniczański or Wawrzek for short PhD in Quantum Chemistry & MSc in Molecular Engineering WWW: http://wawrzek.name E-MAIL: jobs(a)wawrzek.name Linux User #177124

1 0