obs-studio: 21.1.2 -> 22.0.2
This commit is contained in:
parent
a9d0b83bd0
commit
e9faf00a90
@ -18,6 +18,7 @@
|
|||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pkgconfig
|
, pkgconfig
|
||||||
, vlc
|
, vlc
|
||||||
|
, mbedtls
|
||||||
|
|
||||||
, alsaSupport ? false
|
, alsaSupport ? false
|
||||||
, alsaLib
|
, alsaLib
|
||||||
@ -29,17 +30,15 @@ let
|
|||||||
optional = stdenv.lib.optional;
|
optional = stdenv.lib.optional;
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "obs-studio-${version}";
|
name = "obs-studio-${version}";
|
||||||
version = "21.1.2";
|
version = "22.0.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jp9000";
|
owner = "jp9000";
|
||||||
repo = "obs-studio";
|
repo = "obs-studio";
|
||||||
rev = "${version}";
|
rev = "${version}";
|
||||||
sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
|
sha256 = "1bgp2lirpsbp54vvl3p345njlpgv0d78vac2aqwbl34wqx5sqdk0";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./find-xcb.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake
|
nativeBuildInputs = [ cmake
|
||||||
pkgconfig
|
pkgconfig
|
||||||
];
|
];
|
||||||
@ -59,6 +58,7 @@ in stdenv.mkDerivation rec {
|
|||||||
x264
|
x264
|
||||||
vlc
|
vlc
|
||||||
makeWrapper
|
makeWrapper
|
||||||
|
mbedtls
|
||||||
]
|
]
|
||||||
++ optional alsaSupport alsaLib
|
++ optional alsaSupport alsaLib
|
||||||
++ optional pulseaudioSupport libpulseaudio;
|
++ optional pulseaudioSupport libpulseaudio;
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
|
|
||||||
index cd2b80e1..7d829cdb 100644
|
|
||||||
--- a/libobs/CMakeLists.txt
|
|
||||||
+++ b/libobs/CMakeLists.txt
|
|
||||||
@@ -15,6 +15,7 @@ if(UNIX)
|
|
||||||
find_package(DBus QUIET)
|
|
||||||
if (NOT APPLE)
|
|
||||||
find_package(X11_XCB REQUIRED)
|
|
||||||
+ find_package(XCB REQUIRED)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
set(HAVE_DBUS "0")
|
|
||||||
@@ -161,12 +162,15 @@ elseif(UNIX)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
include_directories(
|
|
||||||
- ${X11_XCB_INCLUDE_DIRS})
|
|
||||||
+ ${X11_XCB_INCLUDE_DIRS}
|
|
||||||
+ ${XCB_INCLUDE_DIRS})
|
|
||||||
add_definitions(
|
|
||||||
- ${X11_XCB_DEFINITIONS})
|
|
||||||
+ ${X11_XCB_DEFINITIONS}
|
|
||||||
+ ${XCB_DEFINITIONS})
|
|
||||||
set(libobs_PLATFORM_DEPS
|
|
||||||
${libobs_PLATFORM_DEPS}
|
|
||||||
- ${X11_XCB_LIBRARIES})
|
|
||||||
+ ${X11_XCB_LIBRARIES}
|
|
||||||
+ ${XCB_LIBRARIES})
|
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
|
||||||
# use the sysinfo compatibility library on bsd
|
|
Loading…
x
Reference in New Issue
Block a user