Fix dirs
Some checks failed
PikaOS Package Build & Release (amd64-v3) / build (push) Failing after 19s

This commit is contained in:
Ward from fusion-voyager-3 2025-02-25 22:47:29 +03:00
parent a3e4bb963a
commit 7c1b6f1b8f
4 changed files with 10 additions and 9 deletions

View File

@ -1 +1 @@
4 5

8
debian/rules vendored
View File

@ -1,11 +1,11 @@
#!/usr/bin/make -f #!/usr/bin/make -f
BASE_DIR := $(CURDIR) BASE_DIR := $(CURDIR)
CEF_DIR := $(BASE_DIR)/cef_binary_5060_linux64 CEF_DIR := $(BASE_DIR)/build_dependencies/cef
AJA_DIR := $(BASE_DIR)/ntv2 AJA_DIR := $(BASE_DIR)/build_dependencies/aja
%: %:
dh $@ dh $@
override_dh_auto_configure: override_dh_auto_configure:
#dh_auto_configure -- -DOBS_VERSION_OVERRIDE="29.1.3" -DBUILD_FOR_PPA=ON -DTWITCH_CLIENTID='unla3~mb`xq9`1dhr?1lhhg`65mah0' -DTWITCH_HASH='2D4A98C454B4B0B6' -DRESTREAM_CLIENTID='ml6b16ec(n9?1#9g?m#>9f0,gnkojhhd;oh6' -DRESTREAM_HASH='2DE8E8C514397EE9' -DYOUTUBE_CLIENTID='153066229607$$;a7mw2ig756r?vc<f{`3tr3|i4gq167?$$lrpw,``jbnerwb{ibltals!fjo' -DYOUTUBE_CLIENTID_HASH='2DA97470255F7240' -DYOUTUBE_SECRET=';kV4NTXP5r>D`7bdLO^>gT8U' -DYOUTUBE_SECRET_HASH='F6215E72FC78C76F' -DENABLE_PIPEWIRE=ON -DENABLE_AJA=ON -DENABLE_NEW_MPEGTS_OUTPUT=ON -DCMAKE_PREFIX_PATH=$(AJA_DIR) -DCEF_ROOT_DIR=$(CEF_DIR) -DCMAKE_BUILD_TYPE=Release dh_auto_configure -- -DOBS_VERSION_OVERRIDE="31.0.1" -DTWITCH_CLIENTID='unla3~mb`xq9`1dhr?1lhhg`65mah0' -DTWITCH_HASH='2D4A98C454B4B0B6' -DRESTREAM_CLIENTID='ml6b16ec(n9?1#9g?m#>9f0,gnkojhhd;oh6' -DRESTREAM_HASH='2DE8E8C514397EE9' -DYOUTUBE_CLIENTID='153066229607$$;a7mw2ig756r?vc<f{`3tr3|i4gq167?$$lrpw,``jbnerwb{ibltals!fjo' -DYOUTUBE_CLIENTID_HASH='2DA97470255F7240' -DYOUTUBE_SECRET=';kV4NTXP5r>D`7bdLO^>gT8U' -DYOUTUBE_SECRET_HASH='F6215E72FC78C76F' -DENABLE_PIPEWIRE=ON -DENABLE_AJA=ON -DENABLE_NEW_MPEGTS_OUTPUT=ON -DCMAKE_PREFIX_PATH=$(AJA_DIR) -DCEF_ROOT_DIR=$(CEF_DIR) -DCMAKE_BUILD_TYPE=Release -DENABLE_WEBRTC=OFF -DENABLE_LIBFDK=ON -DENABLE_JACK=ON -DENABLE_RTMPS=ON -DENABLE_BROWSER=ON -DOBS_CMAKE_VERSION=3
dh_auto_configure -- -DBUILD_FOR_PPA=ON -DTWITCH_CLIENTID='unla3~mb`xq9`1dhr?1lhhg`65mah0' -DTWITCH_HASH='2D4A98C454B4B0B6' -DRESTREAM_CLIENTID='ml6b16ec(n9?1#9g?m#>9f0,gnkojhhd;oh6' -DRESTREAM_HASH='2DE8E8C514397EE9' -DYOUTUBE_CLIENTID='153066229607$$;a7mw2ig756r?vc<f{`3tr3|i4gq167?$$lrpw,``jbnerwb{ibltals!fjo' -DYOUTUBE_CLIENTID_HASH='2DA97470255F7240' -DYOUTUBE_SECRET=';kV4NTXP5r>D`7bdLO^>gT8U' -DYOUTUBE_SECRET_HASH='F6215E72FC78C76F' -DENABLE_PIPEWIRE=ON -DENABLE_NEW_MPEGTS_OUTPUT=ON -DENABLE_AJA=OFF -DCEF_ROOT_DIR=$(CEF_DIR) -DCMAKE_BUILD_TYPE=Release -DENABLE_WEBRTC=OFF

View File

@ -14,9 +14,11 @@ git clone --recursive https://github.com/obsproject/obs-studio.git -b "$VERSION"
cp -rvf ./debian ./obs-studio/ cp -rvf ./debian ./obs-studio/
cd ./obs-studio cd ./obs-studio
wget https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2 mkdir -p ./build_dependencies
tar -xf ./cef_binary_5060_linux64.tar.bz2 -C ./ wget https://cdn-fastly.obsproject.com/downloads/cef_binary_6533_linux64.tar.bz2
#git clone https://github.com/aja-video/ntv2.git tar -xf ./cef_binary_6533_linux64.tar.bz2 -C ./
mv -vf ./cef_binary_6533_linux64 ./build_dependencies/cef
git --depth 1 clone https://github.com/aja-video/libajantv2.git ./build_dependencies/aja
for i in $(cat ../patches/series) ; do echo "Applying Patch: $i" && patch -Np1 -i ../patches/$i || echo "Applying Patch $i Failed!"; done for i in $(cat ../patches/series) ; do echo "Applying Patch: $i" && patch -Np1 -i ../patches/$i || echo "Applying Patch $i Failed!"; done

View File

@ -1,7 +1,6 @@
01_use-sysytem-libsimde.patch 01_use-sysytem-libsimde.patch
02_disable-obs-browser.patch 02_disable-obs-browser.patch
03_FTBFS-gcc-14-32-bits.patch 03_FTBFS-gcc-14-32-bits.patch
99_AMF-encoder.patch
obs-studio-fix-incompatible-pointer-type.patch obs-studio-fix-incompatible-pointer-type.patch
obs-studio-UI-use-fdk-aac-by-default.patch obs-studio-UI-use-fdk-aac-by-default.patch
472.patch 472.patch