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

Update VCPKG to master branch #346

Merged
merged 4 commits into from
Apr 25, 2024

Conversation

joiskash
Copy link
Collaborator

IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).

Fixes #341 #323

Description

Updated vcpkg, moved libmp4, baresip, openh264 apra, re to custom overlays.
Added gtk3, glew and glfw to CMakelists from vcpkg

Alternative(s) considered

Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Type

Type Choose one: (Bug fix | Feature | Documentation | Testing | Other)

Screenshots (if applicable)

Checklist

  • I have read the Contribution Guidelines
  • I have written Unit Tests
  • I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach

@joiskash joiskash changed the title Kj/apra nvr common build vcpkg Update VCPKG to master branch Apr 23, 2024
@yashrajsapra yashrajsapra merged commit e40a08e into ApraNVR_CommonBuild Apr 25, 2024
@yashrajsapra yashrajsapra deleted the kj/ApraNVR_CommonBuild_vcpkg branch April 25, 2024 13:18
mraduldubey added a commit that referenced this pull request Jul 2, 2024
* NVR initial commit

* Removed NVRControl Module, moving to apranvr

* Adding Pipeline.cpp changes

* sprint-3 changes

* typo change in rtsp

* Play/pause and golive working checkpoint

* Sprint-4 changes for ApraPipes

* Thumnail generatormodule

* added ifdef condition in thumbnaillistgenerator

* Reverse play ApraPipes(zaki)

* H264DecoderNvCodecHelper changes

* aprapipes sprint 6 changes

* temp commit

* GTLGL working perfectly *

* Reverse play fixes and gtkgl cleanup

* Resolved plyback jitteriness issue

* increased decoder buffered frames limit

* Resolved decoder race conditions

* mmq fps issue fix

* Updated CMake to link with brotli

* FIxed build issue
Added GtkGlRenderer module

* Enabled some cuda test

* Refactoring AbsControlModule

* Obsolete commands removed

* Imageviewer Module Reset

* Updaed CMake to Use System encoder lib

* Added a missing return in a function

* Updated GtkGlRenderer module to support RGB Frame

* Fixed GTKGLRenderer IIssue

* Update VCPKG to master branch  (#346)

* update submodule

* Update vcpkg and move gtk, glew to vcpkg dependecies

* fixed build issue

---------

Co-authored-by: kashhash <[email protected]>
Co-authored-by: Yashraj <[email protected]>

* -> Remove hardcoded path from test
-> Removed Duplicate code

* vcpkg submodule updated

* updated baseline

* easy pickings round 1 pr changes

* added source links

* control modules can connect over multiple pipelines, get module returns bool & sp

* cant repeat roles in same pipeline

* added error code for enrollment failure

* minor refactor

* added stdafx again

* typo fix

* disable clang for now. not configured properly

* 1. Stubbed control module methods using virtual methods 2. cleanup

* 1. stubbed the control module mp4 missing videotrack commands
2. update fps for every new video

* Remove pwd. minor changes in CMake, add !windwos for gtk3

* Revert windows option on

* added a todo for future - update fps only in parseFS mode on new video open

* added test data

* Revert "added test data"

This reverts commit 56933c9.

* added files via git lfs

* writer bug

* disabling mmq tests - module will need a review and tests, an update

* uncommented tests

* removed fpermissive flag

* linux fixes

* add export gcc-13 in arm64 boostrap step

* Add missing imports and installation of system libraries

* Add freeflut for glut.h

* Add install steps for vcpkg port

* Add if def arm

* Updated Dependencies for linux build

* Updated Build Dependencies

* -> Removed gtkglrenderer_tests from source
->  Removed Warning
-> Removed  Redundant Logs

* Add gcc 13 export command

* clean up CMakelists.txt and resolve unknown exception in H264Encoder

* increase encoder buffers in h264encodernvcodec

* move MemTypeConversion header in ARM if def

* move ResizeNPPI and  header in ARM if def

* update scripts to install jinja2 using apt-get

* add ARM if def for tests using h264decoder

* Update build-test-lin.yml

* update cloud script to remove gcc-13 path after vcpkg bootstrap

* remove setting PATH for gcc-13

* update gcc path for gcc-11 supported by opencv

* Merged ApraNVR

* Removed flush logiv from decoder and fixed a syntax in mmq

* Updated libmp4 port

* CMakeList commented code fixed

* CmakeList  vcpkg env variable refactor

* uncomment aprapipesut executable in CMakeLists

* Adding cudnn as a vcpkg overlay port

* CMakelist change to use cudnn from custom overlay port

* resolved mereg conflicts and resolved queuecommand issues

* removed comments

* Resolved gtk link issues on arm64

* changed gcc version to 8 for arm github build script

* Resolved issues in Mp4Reader regarding the gop changes being in abstract class

* changed linux cuda gcc version to 8

* Updated the gitgub worflow file of arm64

* changed build dir name for lin

* Updated the cmakelists and workflow file

* updated cmakelists to include glibconfig.h

* added pkg config path as env in the cmakelist

* Added pkg config path as env only for arm64

* Added missing return statements

* disabled H264 nvcodec tests failing on linux

* Updated the encoder test assert

---------

Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Venkat <[email protected]>
Co-authored-by: venkat0907 <[email protected]>
Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Vinayak-YB <[email protected]>
Co-authored-by: Yashraj <[email protected]>
Co-authored-by: kashhash <[email protected]>
Co-authored-by: mradul <[email protected]>
Co-authored-by: Kushal Jain <[email protected]>
Co-authored-by: Kushal Jain <[email protected]>
Co-authored-by: Ankush Jain <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants