mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 13:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/obs-studio: upgrade to 29.1.0

Browse Source
This commit is contained in:
psykose 2023-05-02 20:54:54 +00:00
parent 8e0c1143b7
commit a92887564d
5 changed files with 92 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
community/obs-studio/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=obs-studio
pkgver=29.0.2
pkgrel=4
pkgver=29.1.0
pkgrel=0
pkgdesc="Free and open source software for live streaming and screen recording"
url="https://obsproject.com/"
arch="all !ppc64le !riscv64" # luajit
@ -47,7 +47,7 @@ source="https://github.com/obsproject/obs-studio/archive/$pkgver/obs-studio-$pkg
broken-config.patch
disable-some-plugins.patch
no-glvnd.patch
$pkgname-ffmpeg6.patch::https://github.com/obsproject/obs-studio/commit/2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0.patch
no-werror.patch
"
# armhf, s390x have no vlc
@ -66,6 +66,7 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_SKIP_INSTALL_RPATH=ON \
-DOBS_VERSION_OVERRIDE=$pkgver \
-DENABLE_JACK=ON \
-DENABLE_VLC=$_vlc
@ -77,9 +78,9 @@ package() {
}
sha512sums="
63a832dc6a0a7f07a2f7adf18f1412e8694405d39721144e82dedab8182e17da6f3063f547bc2b33cc7ea053f6dbb8ffda051af5bffdf9773710bd08744faf8f obs-studio-29.0.2.tar.gz
2a0b614b150e7f6533036eb4061898b5841e35d6ca05eb2c42b040502a1c8ee597f2ec74d6482ff1c4c58e9a2210eaa0ffe405a39b5e4e0b7747bcc4f18d8c65 broken-config.patch
7b5cfb745b05175a97a90133d5aa3a40e6e229f4c9f5753dfee9e2a6f7312274351b21cfe967f65f0b541cdf36a2d4e6ce06e88a1e5de1664dc33ea8c3e92582 disable-some-plugins.patch
6d36bb8b0f48b9af840f42eb7e951bd7d70893863eccdbcae64a93db907ef104b167fcfe9096da89dff00c3bc45fc8c09de99cb55e2fb5825f4394df061462fe no-glvnd.patch
deb8583c2e7455b646bb37498b6d064be9884f90f91d048663a16927fc335471d8f97cd25bf972041a8d0aba1642f0752ebaa25291273ad6a3932cacaecf6beb obs-studio-ffmpeg6.patch
39978eb1872d8fc3903db654b0f227f9ff6d66283261f4a5d736b3404ab9549708c468f18f98402ad3e2759ed3e937b56a4fb4eae600bd226cf6b3e7dafe6b0d obs-studio-29.1.0.tar.gz
b692082e7d21ccc8fc15e839821bba7b9692925a50cac7cca2769dae2592254d5ee29057b52d60d666896924e322d8b36b4a2e61446e957d3c146f032fe8cae3 broken-config.patch
91ab3f9f59ed06d77375aa1e1834e4e35d2f6f1de47b202038eb9cc1579cc73749a66e1cbc9323d8be95b3fd812798fe4797b8eba57927301b89f469edc4a987 disable-some-plugins.patch
b462fd7299da4d159e69130adcfcdb49c776c092419bb2cafe3c4520d122161c11137765022494f8450693f323f34082fe95674a9ee17394ca3939004847e418 no-glvnd.patch
cc582c45d85928fb400418df03b6121654cfcca206aa8c636909f0d0141b14749e8fbbb96320fbdec27b042582a96cbffd332eda685f88d28bda602d439e3d1f no-werror.patch
"

30
community/obs-studio/broken-config.patch
View File

@ -1,30 +1,34 @@
the generator expressions get placed into the generated .pc file otherwise (non
x86/ppc)
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
index c939146..89c022b 100644
index 41c56da..0535724 100644
--- a/cmake/Modules/CompilerConfig.cmake
+++ b/cmake/Modules/CompilerConfig.cmake
@@ -134,8 +134,7 @@ else()
@@ -162,8 +162,7 @@ else()
check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD)
check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
set(ARCH_SIMD_FLAGS
-DSIMDE_ENABLE_OPENMP
- "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
+ -fopenmp-simd
)
- -DSIMDE_ENABLE_OPENMP "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>")
+ -DSIMDE_ENABLE_OPENMP -fopenmp-simd)
endif()
endif()
diff --git a/cmake/external/ObsPluginHelpers.cmake b/cmake/external/ObsPluginHelpers.cmake
index da2cdee..d547b01 100644
index 811c4aa..479520f 100644
--- a/cmake/external/ObsPluginHelpers.cmake
+++ b/cmake/external/ObsPluginHelpers.cmake
@@ -272,8 +272,7 @@ elseif(_HOST_ARCH MATCHES "arm64|arm64e|aarch64")
@@ -244,9 +244,10 @@ elseif(_HOST_ARCH MATCHES "arm64|arm64e|aarch64")
check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
target_compile_options(
${CMAKE_PROJECT_NAME}
PRIVATE
-DSIMDE_ENABLE_OPENMP
- PRIVATE -DSIMDE_ENABLE_OPENMP
- "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>")
+ PRIVATE
+ -DSIMDE_ENABLE_OPENMP
+ -fopenmp-simd
)
+ )
endif()
endif()

13
community/obs-studio/disable-some-plugins.patch
View File

@ -6,30 +6,27 @@ aja exists but isn't friendly to package (no soversion), and is just a plugin
for some fancy enterprise hardware
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index d20bce1..92f7734 100644
index f928f77..0cde953 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -61,7 +61,7 @@ elseif(OS_LINUX)
@@ -153,7 +153,6 @@ elseif(OS_LINUX)
add_subdirectory(sndio)
add_subdirectory(obs-vst)
- check_obs_browser()
+ #check_obs_browser()
elseif(OS_FREEBSD)
add_subdirectory(linux-capture)
add_subdirectory(linux-pulseaudio)
@@ -85,7 +85,7 @@ endif()
add_subdirectory(linux-pipewire)
@@ -178,7 +177,6 @@ endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/obs-websocket/CMakeLists.txt)
add_subdirectory(obs-websocket)
else()
- obs_status(FATAL_ERROR "obs-websocket submodule not available.")
+ #obs_status(FATAL_ERROR "obs-websocket submodule not available.")
endif()
add_subdirectory(image-source)
@@ -97,4 +97,4 @@ add_subdirectory(obs-filters)
@@ -190,4 +188,3 @@ add_subdirectory(obs-filters)
add_subdirectory(obs-transitions)
add_subdirectory(rtmp-services)
add_subdirectory(text-freetype2)
-add_subdirectory(aja)
+#add_subdirectory(aja)

53
community/obs-studio/no-glvnd.patch
View File

@ -1,25 +1,45 @@
cmake refuses to find EGL without glvnd, which alpine does not use yet
diff --git a/deps/glad/CMakeLists.txt b/deps/glad/CMakeLists.txt
index 0e49e1d..69dca8b 100644
index ccfca1c..65c591e 100644
--- a/deps/glad/CMakeLists.txt
+++ b/deps/glad/CMakeLists.txt
@@ -29,7 +29,10 @@ if(OS_WINDOWS)
target_sources(glad PRIVATE src/glad_wgl.c include/glad/glad_wgl.h obsglad.rc)
@@ -18,11 +18,9 @@ target_link_libraries(obsglad PUBLIC OpenGL::GL)
if(OS_WINDOWS)
target_sources(obsglad PRIVATE src/glad_wgl.c include/glad/glad_wgl.h)
elseif(OS_LINUX OR OS_FREEBSD)
- if(TARGET OpenGL::EGL)
- target_sources(obsglad PRIVATE src/glad_egl.c include/EGL/eglplatform.h include/glad/glad_egl.h)
+ target_sources(obsglad PRIVATE src/glad_egl.c include/EGL/eglplatform.h include/glad/glad_egl.h)
elseif(OS_POSIX AND NOT OS_MACOS)
- find_package(OpenGL REQUIRED)
- target_link_libraries(obsglad PRIVATE OpenGL::EGL)
- endif()
+ target_link_libraries(obsglad PRIVATE OpenGL::EGL)
endif()
set_target_properties(obsglad PROPERTIES FOLDER deps POSITION_INDEPENDENT_CODE TRUE)
diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt
index 641f5cc..62cb164 100644
--- a/libobs-opengl/CMakeLists.txt
+++ b/libobs-opengl/CMakeLists.txt
@@ -52,10 +52,9 @@ elseif(OS_LINUX OR OS_FREEBSD)
target_link_libraries(libobs-opengl PRIVATE xcb::xcb X11::x11-xcb)
if(ENABLE_WAYLAND)
- find_package(
- OpenGL
- COMPONENTS EGL
- REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(EGL REQUIRED egl IMPORTED_TARGET GLOBAL)
+ add_library(OpenGL::EGL ALIAS PkgConfig::EGL)
+ #find_package(OpenGL REQUIRED)
if(TARGET OpenGL::EGL)
target_sources(glad PRIVATE src/glad_egl.c include/EGL/eglplatform.h
diff --git a/libobs-opengl/CMakeLists.txt b/libobs-opengl/CMakeLists.txt
index 78642d8..25b921a 100644
--- a/libobs-opengl/CMakeLists.txt
+++ b/libobs-opengl/CMakeLists.txt
@@ -57,10 +57,10 @@ elseif(OS_POSIX)
find_package(Wayland REQUIRED)
diff --git a/libobs-opengl/cmake/legacy.cmake b/libobs-opengl/cmake/legacy.cmake
index f540876..33b29db 100644
--- a/libobs-opengl/cmake/legacy.cmake
+++ b/libobs-opengl/cmake/legacy.cmake
@@ -56,10 +56,9 @@ elseif(OS_POSIX)
set_target_properties(libobs-opengl PROPERTIES PREFIX "")
if(ENABLE_WAYLAND)
@ -27,10 +47,9 @@ index 78642d8..25b921a 100644
- OpenGL
- COMPONENTS EGL
- REQUIRED)
+ # find_package(
+ # OpenGL
+ # COMPONENTS EGL
+ # REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(EGL REQUIRED egl IMPORTED_TARGET GLOBAL)
+ add_library(OpenGL::EGL ALIAS PkgConfig::EGL)
find_package(Wayland REQUIRED)
target_sources(libobs-opengl PRIVATE gl-wayland-egl.c)

24
community/obs-studio/no-werror.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/cmake/Modules/CompilerConfig.cmake b/cmake/Modules/CompilerConfig.cmake
index 41c56da..b8f8bf3 100644
--- a/cmake/Modules/CompilerConfig.cmake
+++ b/cmake/Modules/CompilerConfig.cmake
@@ -101,7 +101,6 @@ else()
option(CALM_DEPRECATION "Keep deprecated-declarations as warnings" OFF)
add_compile_options(
- -Werror
-Wextra
-Wvla
-Wswitch
diff --git a/cmake/external/ObsPluginHelpers.cmake b/cmake/external/ObsPluginHelpers.cmake
index 811c4aa..26ba293 100644
--- a/cmake/external/ObsPluginHelpers.cmake
+++ b/cmake/external/ObsPluginHelpers.cmake
@@ -167,7 +167,6 @@ if(OS_POSIX)
target_compile_options(
${CMAKE_PROJECT_NAME}
PRIVATE
- -Werror
-Wextra
-Wvla
-Wformat