From 9c540d8abb07d931dc3c6e02be125725fe98f7d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 12 Oct 2022 19:25:32 +0300 Subject: [PATCH] Move everything to net/ndi for preparing to merge into gst-plugins-rs --- .gitignore | 64 --------------------- .travis.yml | 30 ---------- Cargo.toml => net/ndi/Cargo.toml | 0 LICENSE => net/ndi/LICENSE | 0 README.md => net/ndi/README.md | 0 build.rs => net/ndi/build.rs | 0 {src => net/ndi/src}/device_provider/imp.rs | 0 {src => net/ndi/src}/device_provider/mod.rs | 0 {src => net/ndi/src}/lib.rs | 0 {src => net/ndi/src}/ndi.rs | 0 {src => net/ndi/src}/ndisink/imp.rs | 0 {src => net/ndi/src}/ndisink/mod.rs | 0 {src => net/ndi/src}/ndisinkcombiner/imp.rs | 0 {src => net/ndi/src}/ndisinkcombiner/mod.rs | 0 {src => net/ndi/src}/ndisinkmeta.rs | 0 {src => net/ndi/src}/ndisrc/imp.rs | 0 {src => net/ndi/src}/ndisrc/mod.rs | 0 {src => net/ndi/src}/ndisrcdemux/imp.rs | 0 {src => net/ndi/src}/ndisrcdemux/mod.rs | 0 {src => net/ndi/src}/ndisrcmeta.rs | 0 {src => net/ndi/src}/ndisys.rs | 0 {src => net/ndi/src}/receiver.rs | 0 22 files changed, 94 deletions(-) delete mode 100644 .gitignore delete mode 100644 .travis.yml rename Cargo.toml => net/ndi/Cargo.toml (100%) rename LICENSE => net/ndi/LICENSE (100%) rename README.md => net/ndi/README.md (100%) rename build.rs => net/ndi/build.rs (100%) rename {src => net/ndi/src}/device_provider/imp.rs (100%) rename {src => net/ndi/src}/device_provider/mod.rs (100%) rename {src => net/ndi/src}/lib.rs (100%) rename {src => net/ndi/src}/ndi.rs (100%) rename {src => net/ndi/src}/ndisink/imp.rs (100%) rename {src => net/ndi/src}/ndisink/mod.rs (100%) rename {src => net/ndi/src}/ndisinkcombiner/imp.rs (100%) rename {src => net/ndi/src}/ndisinkcombiner/mod.rs (100%) rename {src => net/ndi/src}/ndisinkmeta.rs (100%) rename {src => net/ndi/src}/ndisrc/imp.rs (100%) rename {src => net/ndi/src}/ndisrc/mod.rs (100%) rename {src => net/ndi/src}/ndisrcdemux/imp.rs (100%) rename {src => net/ndi/src}/ndisrcdemux/mod.rs (100%) rename {src => net/ndi/src}/ndisrcmeta.rs (100%) rename {src => net/ndi/src}/ndisys.rs (100%) rename {src => net/ndi/src}/receiver.rs (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bbec86db..00000000 --- a/.gitignore +++ /dev/null @@ -1,64 +0,0 @@ - -# Created by https://www.gitignore.io/api/rust,emacs - -### Emacs ### -# -*- mode: gitignore; -*- -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -*.elc -auto-save-list -tramp -.\#* - -# Org-mode -.org-id-locations -*_archive - -# flymake-mode -*_flymake.* - -# eshell files -/eshell/history -/eshell/lastdir - -# elpa packages -/elpa/ - -# reftex files -*.rel - -# AUCTeX auto folder -/auto/ - -# cask packages -.cask/ -dist/ - -# Flycheck -flycheck_*.el - -# server auth directory -/server/ - -# projectiles files -.projectile - -# directory configuration -.dir-locals.el - -### Rust ### -# Generated by Cargo -# will have compiled files and executables -/target/ - -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - -# These are backup files generated by rustfmt -**/*.rs.bk - - -# End of https://www.gitignore.io/api/rust,emacs diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c8060043..00000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -language: rust -rust: - - stable -addons: - apt: - packages: - - libgstreamer1.0-dev - - libgstreamer-plugins-base1.0-dev - - gstreamer1.0-plugins-base - - gstreamer1.0-plugins-good - - gstreamer1.0-plugins-bad - - gstreamer1.0-plugins-ugly - - gstreamer1.0-libav -before_install: - - curl -kLO https://slepin.fr/obs-ndi/ci/ndisdk-slim-v3.5-linux.zip -f --retry 5 && unzip ./ndisdk-slim-v3.5-linux.zip && rm ./ndisdk-slim-v3.5-linux.zip - - sudo cp ndisdk/lib/x86_64-linux-gnu/libndi.so.3.5.1 /usr/local/lib/libndi.so && sudo ldconfig - - curl -L https://people.freedesktop.org/~slomo/gstreamer-1.14.3.tar.gz | tar xz - - sed -i "s;prefix=/root/gstreamer;prefix=$PWD/gstreamer;g" $PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig/*.pc - - export PKG_CONFIG_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/pkgconfig - - export GST_PLUGIN_SYSTEM_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu/gstreamer-1.0 - - export GST_PLUGIN_SCANNER=$PWD/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner - - export PATH=$PATH:$PWD/gstreamer/bin - - export LD_LIBRARY_PATH=$PWD/gstreamer/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH -install: - - rustup component add rustfmt-preview - - rustup component add clippy-preview -script: - - cargo fmt -- --check - - cargo build --no-default-features - - touch ./src/*.rs && cargo clippy --no-default-features -- -A clippy::cast_ptr_alignment -A clippy::new_ret_no_self -Aclippy::or_fun_call -A clippy::cast_lossless -A clippy::too_many_arguments \ No newline at end of file diff --git a/Cargo.toml b/net/ndi/Cargo.toml similarity index 100% rename from Cargo.toml rename to net/ndi/Cargo.toml diff --git a/LICENSE b/net/ndi/LICENSE similarity index 100% rename from LICENSE rename to net/ndi/LICENSE diff --git a/README.md b/net/ndi/README.md similarity index 100% rename from README.md rename to net/ndi/README.md diff --git a/build.rs b/net/ndi/build.rs similarity index 100% rename from build.rs rename to net/ndi/build.rs diff --git a/src/device_provider/imp.rs b/net/ndi/src/device_provider/imp.rs similarity index 100% rename from src/device_provider/imp.rs rename to net/ndi/src/device_provider/imp.rs diff --git a/src/device_provider/mod.rs b/net/ndi/src/device_provider/mod.rs similarity index 100% rename from src/device_provider/mod.rs rename to net/ndi/src/device_provider/mod.rs diff --git a/src/lib.rs b/net/ndi/src/lib.rs similarity index 100% rename from src/lib.rs rename to net/ndi/src/lib.rs diff --git a/src/ndi.rs b/net/ndi/src/ndi.rs similarity index 100% rename from src/ndi.rs rename to net/ndi/src/ndi.rs diff --git a/src/ndisink/imp.rs b/net/ndi/src/ndisink/imp.rs similarity index 100% rename from src/ndisink/imp.rs rename to net/ndi/src/ndisink/imp.rs diff --git a/src/ndisink/mod.rs b/net/ndi/src/ndisink/mod.rs similarity index 100% rename from src/ndisink/mod.rs rename to net/ndi/src/ndisink/mod.rs diff --git a/src/ndisinkcombiner/imp.rs b/net/ndi/src/ndisinkcombiner/imp.rs similarity index 100% rename from src/ndisinkcombiner/imp.rs rename to net/ndi/src/ndisinkcombiner/imp.rs diff --git a/src/ndisinkcombiner/mod.rs b/net/ndi/src/ndisinkcombiner/mod.rs similarity index 100% rename from src/ndisinkcombiner/mod.rs rename to net/ndi/src/ndisinkcombiner/mod.rs diff --git a/src/ndisinkmeta.rs b/net/ndi/src/ndisinkmeta.rs similarity index 100% rename from src/ndisinkmeta.rs rename to net/ndi/src/ndisinkmeta.rs diff --git a/src/ndisrc/imp.rs b/net/ndi/src/ndisrc/imp.rs similarity index 100% rename from src/ndisrc/imp.rs rename to net/ndi/src/ndisrc/imp.rs diff --git a/src/ndisrc/mod.rs b/net/ndi/src/ndisrc/mod.rs similarity index 100% rename from src/ndisrc/mod.rs rename to net/ndi/src/ndisrc/mod.rs diff --git a/src/ndisrcdemux/imp.rs b/net/ndi/src/ndisrcdemux/imp.rs similarity index 100% rename from src/ndisrcdemux/imp.rs rename to net/ndi/src/ndisrcdemux/imp.rs diff --git a/src/ndisrcdemux/mod.rs b/net/ndi/src/ndisrcdemux/mod.rs similarity index 100% rename from src/ndisrcdemux/mod.rs rename to net/ndi/src/ndisrcdemux/mod.rs diff --git a/src/ndisrcmeta.rs b/net/ndi/src/ndisrcmeta.rs similarity index 100% rename from src/ndisrcmeta.rs rename to net/ndi/src/ndisrcmeta.rs diff --git a/src/ndisys.rs b/net/ndi/src/ndisys.rs similarity index 100% rename from src/ndisys.rs rename to net/ndi/src/ndisys.rs diff --git a/src/receiver.rs b/net/ndi/src/receiver.rs similarity index 100% rename from src/receiver.rs rename to net/ndi/src/receiver.rs