From 657a6ea9161d1afe780bb46c4df0e95473353e6b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 4 Sep 2022 00:45:25 +0000 Subject: [PATCH 1/5] Add CMake options ENABLE_DECODER and ENABLE_ENCODER --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff93c52e..160dbb1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,13 @@ if(MSVC) add_definitions(-DHAVE_STDBOOL_H) endif() +option(ENABLE_DECODER "Enable Decoder" ON) +option(ENABLE_ENCODER "Enable Encoder" ON) + add_subdirectory (libde265) -add_subdirectory (dec265) -add_subdirectory (enc265) +if (ENABLE_DECODER) + add_subdirectory (dec265) +endif() +if (ENABLE_ENCODER) + add_subdirectory (enc265) +endif() From 296130f382c2822f819be14373343044483c8dd4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 20 Oct 2022 20:36:22 +1100 Subject: [PATCH 2/5] CMake disable encoder by default - match configure option - https://github.com/strukturag/libde265/commit/3673889c47a78a67f5d225321b6604b3fa6e93e7 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 160dbb1d..33dab60a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ if(MSVC) endif() option(ENABLE_DECODER "Enable Decoder" ON) -option(ENABLE_ENCODER "Enable Encoder" ON) +option(ENABLE_ENCODER "Enable Encoder" OFF) add_subdirectory (libde265) if (ENABLE_DECODER) From 58659deaac3ceadc9471d207bc0d4b66693489cb Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 25 Oct 2022 09:49:04 +0200 Subject: [PATCH 3/5] make: Include m4 files in release tarball. --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index bbacd3f8..b4098f8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,10 @@ endif EXTRA_DIST = \ autogen.sh \ build.bat \ + m4/ax_compare_version.m4 \ + m4/ax_cxx_compile_stdcxx_11.m4 \ m4/m4_ax_check_compile_flag.m4 \ + m4/visibility.m4 \ Makefile.vc7 \ CMakeLists.txt \ README.md \ From b6676da7ea1d428c39895f07c15a2e23228231c5 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 25 Oct 2022 10:30:29 +0200 Subject: [PATCH 4/5] dependabot: Track github actions. --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..12301490 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From dfbc3102ee7787e837c598d80515b4081dbb12d4 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 25 Oct 2022 11:11:35 +0200 Subject: [PATCH 5/5] coverity: Build from GitHub action. --- .github/workflows/coverity.yml | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/coverity.yml diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml new file mode 100644 index 00000000..38ec1288 --- /dev/null +++ b/.github/workflows/coverity.yml @@ -0,0 +1,49 @@ +name: coverity + +on: + push: + branches: [ coverity ] + +jobs: + scan: + runs-on: ubuntu-latest + env: + TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} + steps: + - uses: actions/checkout@v3 + + - name: Cache Coverity build tool + uses: actions/cache@v3 + with: + path: | + coverity_tool.tar.gz + key: ${{ runner.os }} + + - name: Download Coverity build tool + run: | + wget -c -N https://scan.coverity.com/download/linux64 --post-data "token=$TOKEN&project=libde265" -O coverity_tool.tar.gz + mkdir coverity_tool + tar xzf coverity_tool.tar.gz --strip 1 -C coverity_tool + + - name: Install dependencies + run: | + ./scripts/ci-before-install-linux.sh + + - name: Prepare CI + run: | + ./scripts/ci-before-script.sh + + - name: Build with Coverity build tool + run: | + export PATH=`pwd`/coverity_tool/bin:$PATH + cov-build --dir cov-int make + + - name: Submit build result to Coverity Scan + run: | + tar czvf libde265.tar.gz cov-int + curl --form token=$TOKEN \ + --form email=opensource@struktur.de \ + --form file=@libde265.tar.gz \ + --form version="Commit $GITHUB_SHA" \ + --form description="Build submitted via CI" \ + https://scan.coverity.com/builds?project=libde265