Skip to content

Commit

Permalink
use cpack for package deb & build problem fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kounoike committed Apr 6, 2022
1 parent 741e383 commit 44cc856
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: linux-archive
path: package/*
path: build/obs-virtualbg-*.deb
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,12 @@ elseif(UNIX AND NOT APPLE)
install(FILES ${models} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/${CMAKE_PROJECT_NAME})
install(FILES ${effects} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/obs/obs-plugins/${CMAKE_PROJECT_NAME})
install(FILES ${OnnxRuntime_INSTALL} DESTINATION ${OBS_PLUGIN_DESTINATION}/../obs-virtualbg)

set(CPACK_GENERATOR "DEB")
set(CPACK_PACKAGE_DEPENDS "obs-studio (>= 27.2.0)")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "kounoike.yuusuke@gmail.com")
set(CPACK_DEBIAN_PACKAGE_SECTION "video")
include(CPack)
endif()

#include(ObsHelpers)
Expand Down
3 changes: 2 additions & 1 deletion scripts/build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ DEPS_DIR=$(pwd)/deps

mkdir -p build
pushd build
CC=clang-12 CXX=clang++-12 cmake .. \
cmake .. \
-DHalide_DIR=${DEPS_DIR}/Halide/lib/cmake/Halide \
-DHalideHelpers_DIR=${DEPS_DIR}/Halide/lib/cmake/HalideHelpers \
-DCMAKE_INSTALL_PREFIX=/usr \
-DOBS_PLUGIN_DESTINATION='/usr/lib/obs-plugins' \
-DCMAKE_INSTALL_RPATH="/usr/lib/obs-virtualbg"
cmake --build . --config RelWithDebInfo
cpack
popd
5 changes: 0 additions & 5 deletions scripts/install_pkgs_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@ pip3 install cmake

DEPS_DIR=$(cd $(dirname $0)/..;pwd)/deps
[ -d ${DEPS_DIR} ] || mkdir ${DEPS_DIR}

curl -L -o ${DEPS_DIR}/llvm.sh https://apt.llvm.org/llvm.sh
chmod +x ${DEPS_DIR}/llvm.sh
${DEPS_DIR}/llvm.sh 12
apt-get install libc++-12-dev libc++1-12 libc++abi1-12
24 changes: 0 additions & 24 deletions scripts/package_linux.sh

This file was deleted.

0 comments on commit 44cc856

Please sign in to comment.