Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

librist: init at v0.2.7 #194518

Merged
merged 1 commit into from
Oct 9, 2022
Merged

librist: init at v0.2.7 #194518

merged 1 commit into from
Oct 9, 2022

Conversation

SebTM
Copy link
Contributor

@SebTM SebTM commented Oct 4, 2022

Description of changes

Init librist as preparation for obs-studio update (new dependency)

Things done

Added package

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@SebTM
Copy link
Contributor Author

SebTM commented Oct 4, 2022

Did not find CMake 'cmake'
Found CMake: NO
Run-time dependency cjson found: NO (tried pkgconfig and cmake)
Has header "cjson/cJSON.h" : NO
Message: Using builtin cJSON library
Message: Building mbedtls
Run-time dependency mbedcrypto found: NO (tried pkgconfig and cmake)
Has header "mbedtls/aes.h" : NO
Message: Using builtin mbedtls code
Configuring version.h using configuration
Program objcopy found: YES
Configuring config.h using configuration
Message: Building tools
Library cmocka found: NO
test/rist/meson.build:72: DEPRECATION: ":" is not allowed in test name "Main profile encryption receive server mode unencrupted, sender: client mode", it has been replaced with "_"
test/rist/meson.build:75: DEPRECATION: ":" is not allowed in test name "Main profile encryption client mode, sender: server mode unencrypted", it has been replaced with "_"
Build targets in project: 7
NOTICE: Future-deprecated features used:
 * 0.56.0: {'meson.source_root'}

Currently builds successful without cmake, if cmake enabled this error occurred which I couldn't solve/find it's root:

this derivation will be built:
  /nix/store/9zppx79cf2xzw0ff5bv9ri1qg2dm5g8n-librist-0.2.6.drv
this path will be fetched (9.89 MiB download, 41.34 MiB unpacked):
  /nix/store/aw946f68hy6y76q06aw9mw0fqjrzwk4q-cmake-3.24.1
copying path '/nix/store/aw946f68hy6y76q06aw9mw0fqjrzwk4q-cmake-3.24.1' from 'https://cache.nixos.org'...
building '/nix/store/9zppx79cf2xzw0ff5bv9ri1qg2dm5g8n-librist-0.2.6.drv'...
unpacking sources
unpacking source archive /nix/store/i4y48pa96akwiaikcj2alhh5ywww1n52-source
source root is source
patching sources
configuring
fixing cmake files...
cmake flags: -GNinja -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_INSTALL_LOCALEDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/share/locale -DCMAKE_INSTALL_LIBEXECDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/libexec -DCMAKE_INSTALL_LIBDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/lib -DCMAKE_INSTALL_DOCDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/share/doc/librist -DCMAKE_INSTALL_INFODIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/share/info -DCMAKE_INSTALL_MANDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/share/man -DCMAKE_INSTALL_OLDINCLUDEDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/include -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/include -DCMAKE_INSTALL_SBINDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/sbin -DCMAKE_INSTALL_BINDIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/bin -DCMAKE_INSTALL_NAME_DIR=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_SYSROOT= -DCMAKE_FIND_FRAMEWORK=LAST -DCMAKE_STRIP=/nix/store/j061mvdxw70xz20r2r0lr5lk0rcsjf9i-gcc-wrapper-11.3.0/bin/strip -DCMAKE_RANLIB=/nix/store/j061mvdxw70xz20r2r0lr5lk0rcsjf9i-gcc-wrapper-11.3.0/bin/ranlib -DCMAKE_AR=/nix/store/j061mvdxw70xz20r2r0lr5lk0rcsjf9i-gcc-wrapper-11.3.0/bin/ar -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=/nix/store/z9km10xa42m31b0yznjdd10mrhygvi88-librist-0.2.6
CMake Warning:
  Ignoring extra path from command line:

   ".."


CMake Error: The source directory "/build/source" does not appear to contain CMakeLists.txt.
Specify --help for usage, or press the help button on the CMake GUI.

``

pkgs/os-specific/linux/librist/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/librist/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/librist/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/librist/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/librist/default.nix Outdated Show resolved Hide resolved
@SebTM
Copy link
Contributor Author

SebTM commented Oct 5, 2022

@raphaelr Thanks for your feedback and help! I was able to update the derivation with it and it builds no also with cmake. Only it seems that mbedtls (is it the package providing mbedcrypto?) does not get recognized during the build regardless I add it to nativeBuildInputs or as suggested buildInputs.

this derivation will be built:
  /nix/store/rbca39w1xbz6jh4djl4rn6fjlh7582pn-librist-0.2.6.drv
building '/nix/store/rbca39w1xbz6jh4djl4rn6fjlh7582pn-librist-0.2.6.drv'...
unpacking sources
unpacking source archive /nix/store/i4y48pa96akwiaikcj2alhh5ywww1n52-source
source root is source
patching sources
configuring
meson flags: --buildtype=plain         --libdir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib --libexecdir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/libexec         --bindir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin --sbindir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/sbin         --includedir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include         --mandir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/man --infodir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/info         --localedir=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/locale         -Dauto_features=enabled         -Dwrap_mode=nodownload         --prefix=/nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6
The Meson build system
Version: 0.63.1
Source dir: /build/source
Build dir: /build/source/build
Build type: native build
Project name: libRIST
Project version: 0.2.6
C compiler for the host machine: gcc (gcc 11.3.0 "gcc (GCC) 11.3.0")
C linker for the host machine: gcc ld.bfd 2.39
Host machine cpu family: x86_64
Host machine cpu: x86_64
Check usable header "linux/if_alg.h" : YES
Checking for function "clock_gettime" : YES
Compiler for C supports arguments -Wundef: YES
Compiler for C supports arguments -Werror=vla: YES
Compiler for C supports arguments -Wno-maybe-uninitialized: YES
Compiler for C supports arguments -Wno-missing-field-initializers: YES
Compiler for C supports arguments -Wno-unused-parameter: YES
Compiler for C supports arguments -Wshorten-64-to-32: NO
Compiler for C supports arguments -Wunused-parameter: YES
Compiler for C supports arguments -Wmaybe-uninitialized: YES
Compiler for C supports arguments -Wno-error=deprecated-declarations: YES
Run-time dependency threads found: YES
Compiler for C supports arguments -Watomic-implicit-seq-cst: NO
Compiler for C supports arguments -fvisibility=hidden: YES
Check usable header "stdatomic.h" : YES
Found pkg-config: /nix/store/p44bsik684s8n77drkihwx6551c6q189-pkg-config-wrapper-0.29.2/bin/pkg-config (0.29.2)
Found CMake: /nix/store/aw946f68hy6y76q06aw9mw0fqjrzwk4q-cmake-3.24.1/bin/cmake (3.24.1)
Run-time dependency cjson found: YES 1.7.15
Message: Building mbedtls
**Run-time dependency mbedcrypto found: NO (tried pkgconfig and cmake)**
Has header "mbedtls/aes.h" : YES
Library mbedcrypto found: YES
Configuring version.h using configuration
Program objcopy found: YES
Configuring config.h using configuration
Message: Building tools
Library cmocka found: YES
test/rist/meson.build:72: DEPRECATION: ":" is not allowed in test name "Main profile encryption receive server mode unencrupted, sender: client mode", it has been replaced with "_"
test/rist/meson.build:75: DEPRECATION: ":" is not allowed in test name "Main profile encryption client mode, sender: server mode unencrypted", it has been replaced with "_"
Build targets in project: 8
NOTICE: Future-deprecated features used:
 * 0.56.0: {'meson.source_root'}

libRIST 0.2.6

  User defined options
    auto_features: enabled
    bindir       : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
    buildtype    : plain
    includedir   : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include
    infodir      : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/info
    libdir       : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib
    libexecdir   : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/libexec
    localedir    : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/locale
    mandir       : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/share/man
    prefix       : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6
    sbindir      : /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/sbin
    wrap_mode    : nodownload

Found ninja-1.11.1 at /nix/store/4q68zlkgl96wlvgn2pz0x1k8vdib983n-ninja-1.11.1/bin/ninja
meson: enabled parallel building
building
build flags: -j16 -l16
[1/53] Compiling C object test/rist/test_send_receive.p/.._.._contrib_time-shim.c.o
[2/53] Compiling C object tools/ristsrppasswd.p/.._contrib_time-shim.c.o
[3/53] Compiling C object test/rist/risttest.p/example-test.c.o
[4/53] Compiling C object tools/ristsrppasswd.p/ristsrppasswd.c.o
[5/53] Compiling C object tools/ristsrppasswd.p/.._contrib_pthread-shim.c.o
[6/53] Compiling C object test/rist/test_send_receive.p/.._.._contrib_pthread-shim.c.o
[7/53] Compiling C object test/rist/test_send_receive.p/test_send_receive.c.o
[8/53] Compiling C object tools/ristsrppasswd.p/.._contrib_srp.c.o
[9/53] Generating include/vcs_version.h with a custom command
[10/53] Compiling C object librist.so.4.1.4.p/contrib_stdio-shim.c.o
[11/53] Compiling C object librist.so.4.1.4.p/src_rist_ref.c.o
[12/53] Compiling C object librist.so.4.1.4.p/contrib_time-shim.c.o
[13/53] Compiling C object librist.so.4.1.4.p/contrib_sha256.c.o
[14/53] Compiling C object librist.so.4.1.4.p/contrib_fastpbkdf2.c.o
[15/53] Compiling C object librist.so.4.1.4.p/src_crypto_crypto.c.o
[16/53] Compiling C object librist.so.4.1.4.p/src_mpegts.c.o
[17/53] Compiling C object librist.so.4.1.4.p/contrib_pthread-shim.c.o
[18/53] Compiling C object librist.so.4.1.4.p/src_crypto_psk.c.o
[19/53] Compiling C object librist.so.4.1.4.p/src_logging.c.o
[20/53] Compiling C object tools/ristsender.p/.._contrib_time-shim.c.o
[21/53] Compiling C object librist.so.4.1.4.p/src_libevsocket.c.o
[22/53] Compiling C object librist.so.4.1.4.p/src_flow.c.o
[23/53] Compiling C object tools/ristsender.p/oob_shared.c.o
[24/53] Compiling C object librist.so.4.1.4.p/src_stats.c.o
[25/53] Compiling C object tools/ristsender.p/srp_shared.c.o
[26/53] Compiling C object librist.so.4.1.4.p/contrib_linux-crypto.c.o
[27/53] Compiling C object librist.so.4.1.4.p/src_udpsocket.c.o
[28/53] Compiling C object tools/ristsender.p/.._contrib_pthread-shim.c.o
[29/53] Compiling C object tools/ristreceiver.p/.._contrib_time-shim.c.o
[30/53] Compiling C object tools/ristreceiver.p/oob_shared.c.o
[31/53] Compiling C object tools/rist2rist.p/.._contrib_time-shim.c.o
[32/53] Compiling C object tools/ristreceiver.p/.._contrib_pthread-shim.c.o
[33/53] Compiling C object tools/ristreceiver.p/srp_shared.c.o
[34/53] Compiling C object tools/rist2rist.p/.._contrib_pthread-shim.c.o
[35/53] Compiling C object tools/rist2rist.p/oob_shared.c.o
[36/53] Compiling C object tools/rist2rist.p/srp_shared.c.o
[37/53] Compiling C object librist.so.4.1.4.p/src_rist.c.o
[38/53] Compiling C object tools/ristsender.p/ristsender.c.o
[39/53] Compiling C object tools/rist2rist.p/rist2rist.c.o
[40/53] Compiling C object librist.so.4.1.4.p/contrib_srp.c.o
[41/53] Compiling C object librist.so.4.1.4.p/src_eap.c.o
[42/53] Compiling C object tools/ristreceiver.p/ristreceiver.c.o
[43/53] Compiling C object librist.so.4.1.4.p/contrib_aes.c.o
[44/53] Compiling C object librist.so.4.1.4.p/src_udp.c.o
[45/53] Compiling C object librist.so.4.1.4.p/src_rist-common.c.o
[46/53] Linking target librist.so.4.1.4
[47/53] Generating symbol file librist.so.4.1.4.p/librist.so.4.1.4.symbols
[48/53] Linking target test/rist/risttest
[49/53] Linking target tools/ristsrppasswd
[50/53] Linking target tools/ristsender
[51/53] Linking target test/rist/test_send_receive
[52/53] Linking target tools/ristreceiver
[53/53] Linking target tools/rist2rist
installing
install flags: install
[1/14] Generating include/vcs_version.h with a custom command
[1/2] Installing files.
Installing librist.so.4.1.4 to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib
Installing tools/ristsender to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
Installing tools/ristreceiver to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
Installing tools/rist2rist to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
Installing tools/ristsrppasswd to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
Installing /build/source/include/librist/librist.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/include/librist/udpsocket.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/include/librist/common.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/include/librist/headers.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/include/librist/logging.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/build/include/librist/version.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/include/librist/librist_srp.h to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/include/librist/
Installing /build/source/build/meson-private/librist.pc to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib/pkgconfig
Installing symlink pointing to librist.so.4.1.4 to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib/librist.so.4
Installing symlink pointing to librist.so.4 to /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib/librist.so
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6
shrinking /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib/librist.so.4.1.4
shrinking /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin/ristsrppasswd
shrinking /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin/rist2rist
shrinking /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin/ristreceiver
shrinking /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin/ristsender
strip is /nix/store/j061mvdxw70xz20r2r0lr5lk0rcsjf9i-gcc-wrapper-11.3.0/bin/strip
stripping (with command strip and flags -S) in  /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/lib /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6/bin
patching script interpreter paths in /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6
checking for references to /build/ in /nix/store/qdp2sx57i5w9qq7vr9rgkiasknz6zx1h-librist-0.2.6...

As you saw I'm not that experienced in packaging this kind of software - would you be maybe be ok to add you also as maintainer?

@raphaelr
Copy link
Contributor

raphaelr commented Oct 5, 2022

Only it seems that mbedtls (is it the package providing mbedcrypto?) does not get recognized during the build

I think it does:

**Run-time dependency mbedcrypto found: NO (tried pkgconfig and cmake)**
Has header "mbedtls/aes.h" : YES
Library mbedcrypto found: YES

The error message is weird, but the 2nd line after that says that the library was found, so I think it's fine.

would you be maybe be ok to add you also as maintainer?

Yeah, no problem, I'm an OBS user anyway.

@SebTM
Copy link
Contributor Author

SebTM commented Oct 5, 2022

Yeah, no problem, I'm an OBS user anyway.

Thanks, updated 👍🏻 // what would you then say about the non cmake-output looks similar to mbedtls so maybe it's also ok without as it stil builds?

@ofborg ofborg bot requested a review from raphaelr October 5, 2022 21:23
Copy link
Member

@eadwu eadwu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest version is 0.2.7

@raphaelr
Copy link
Contributor

raphaelr commented Oct 6, 2022

what would you then say about the non cmake-output looks similar to mbedtls so maybe it's also ok without as it stil builds?

I'd remove cmake

@SebTM
Copy link
Contributor Author

SebTM commented Oct 6, 2022

Updated to v0.2.7, fixed license, removed cmake 👍🏻

@SebTM SebTM changed the title librist: init at v0.2.6 librist: init at v0.2.7 Oct 6, 2022
Copy link
Contributor

@raphaelr raphaelr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of nixpkgs-review pr 194518 run on x86_64-linux 1

1 package built:
  • librist

@ofborg ofborg bot requested a review from raphaelr October 6, 2022 16:12
Copy link
Member

@eadwu eadwu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested separately using a locally built ffmpeg with rist protocol support

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/634

@SuperSandro2000 SuperSandro2000 merged commit 5317b0c into NixOS:master Oct 9, 2022
@SebTM SebTM deleted the add/librist_026 branch October 9, 2022 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants