obs-studio: 29.0.2 -> 29.1.1
This commit is contained in:
parent
4ad2d29afb
commit
f66758e574
GPG Key ID:
42F8B4E30B673606
|
|
@ -120,6 +120,7 @@ drwxr-xr-x root/root usr/include/obs/util/simde/x86/
|
|||
-rw-r--r-- root/root usr/include/obs/util/threading-posix.h
|
||||
-rw-r--r-- root/root usr/include/obs/util/threading.h
|
||||
-rw-r--r-- root/root usr/include/obs/util/utf8.h
|
||||
-rw-r--r-- root/root usr/include/obs/util/uthash.h
|
||||
-rw-r--r-- root/root usr/include/obs/util/util.hpp
|
||||
-rw-r--r-- root/root usr/include/obs/util/util_uint128.h
|
||||
-rw-r--r-- root/root usr/include/obs/util/util_uint64.h
|
||||
|
|
@ -147,9 +148,6 @@ lrwxrwxrwx root/root usr/lib/libobs-scripting.so.1 -> libobs-scripting.so.29
|
|||
lrwxrwxrwx root/root usr/lib/libobs.so -> libobs.so.0
|
||||
lrwxrwxrwx root/root usr/lib/libobs.so.0 -> libobs.so.29
|
||||
-rwxr-xr-x root/root usr/lib/libobs.so.29
|
||||
lrwxrwxrwx root/root usr/lib/libobsglad.so -> libobsglad.so.1
|
||||
lrwxrwxrwx root/root usr/lib/libobsglad.so.1 -> libobsglad.so.29
|
||||
-rwxr-xr-x root/root usr/lib/libobsglad.so.29
|
||||
drwxr-xr-x root/root usr/lib/obs-plugins/
|
||||
-rwxr-xr-x root/root usr/lib/obs-plugins/frontend-tools.so
|
||||
-rwxr-xr-x root/root usr/lib/obs-plugins/image-source.so
|
||||
|
|
@ -243,6 +241,7 @@ drwxr-xr-x root/root usr/share/obs/obs-plugins/obs-filters/LUTs/
|
|||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/black_and_white.png
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/grayscale.cube
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/grayscale.png
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/invert.png
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/original.cube
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/original.png
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-filters/LUTs/posterize.png
|
||||
|
|
@ -321,6 +320,7 @@ drwxr-xr-x root/root usr/share/obs/obs-plugins/obs-transitions/luma_wipes/
|
|||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-transitions/swipe_transition.effect
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/obs-x264/
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/obs-x264/locale/
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-x264/locale/en-GB.ini
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/obs-x264/locale/en-US.ini
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/locale/
|
||||
|
|
@ -328,7 +328,7 @@ drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/locale/
|
|||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/rtmp-services/package.json
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/rtmp-services/schema/
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/rtmp-services/schema/package-schema.json
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/rtmp-services/schema/service-schema-v4.json
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/rtmp-services/schema/service-schema-v5.json
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-plugins/rtmp-services/services.json
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/text-freetype2/
|
||||
drwxr-xr-x root/root usr/share/obs/obs-plugins/text-freetype2/locale/
|
||||
|
|
@ -422,6 +422,7 @@ drwxr-xr-x root/root usr/share/obs/obs-studio/themes/Dark/sources/
|
|||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/sources/window.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/sources/windowaudio.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/trash.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/unassigned.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/up.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/updown.svg
|
||||
-rw-rw-r-- root/root usr/share/obs/obs-studio/themes/Dark/visible.svg
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3+wGDTfF3H7G3ZEvF6VWL4JNqr6x7wdkJwhFnjHQpc+us6S/I8aZvvSvKys72fY7lL0Q0TxUn43GM3qq/JSdKQw=
|
||||
SHA256 (Pkgfile) = 24950fb0673a06f3439d271d3f14d4b8c41cc8084b02b41eb6ae26a1d53f8b70
|
||||
SHA256 (.footprint) = 1383720d49474c2ed5186845ca48cd3436901f5d772f5598e4af49e1a8070c4b
|
||||
SHA256 (obs-studio-29.0.2.tar.gz) = 0e6260800b80c3fc9f67c4c3fb12ffae740ab1dd188e526a55e0fc8949168db2
|
||||
RWSagIOpLGJF36UkMJttcCDmToVO4W6Nm4xduhTCRNsN5ZgP+3Nt9bj4Mc4H9leNFNRvDgCcM4cpB82mckQIlQWwtf6Kf7BZYQA=
|
||||
SHA256 (Pkgfile) = 012d6356d1714739f7881869d3671f9bb65e79d203917c6b35f9ff08b7b88d1d
|
||||
SHA256 (.footprint) = faea1b886f686fa8d3c8ed2e5477dc9384962c229f587737b11606a133099740
|
||||
SHA256 (obs-studio-29.1.1.tar.gz) = 9a37148449d715b3c7cc3e622c291aba9fa45bd354a39453b3e922eb558cf21e
|
||||
SHA256 (disable-some-plugins.patch) = fee180ca12a1831e1e8c09f90db25776abb77daa9befebf7c3f153cc43f99b91
|
||||
SHA256 (2e79d4c9.patch) = 96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
From 2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0 Mon Sep 17 00:00:00 2001
|
||||
From: pkv <pkv@obsproject.com>
|
||||
Date: Tue, 28 Feb 2023 17:28:38 +0100
|
||||
Subject: [PATCH] obs-ffmpeg: Fix for FFmpeg 6 deprecating a flag
|
||||
|
||||
Also modifies libobs & deps/media-playback.
|
||||
AV_CODEC_CAP_TRUNCATED was removed in avcodec 60 [1].
|
||||
We ifdef the code depending on it to allow compilation.
|
||||
|
||||
[1] avcodec: remove FF_API_FLAG_TRUNCATED
|
||||
https://github.com/FFmpeg/FFmpeg/commit/3ceffe783965767e62d59e8e68ecd265c98460ec
|
||||
|
||||
Signed-off-by: pkv <pkv@obsproject.com>
|
||||
---
|
||||
deps/media-playback/media-playback/decode.c | 2 ++
|
||||
deps/media-playback/media-playback/decode.h | 2 ++
|
||||
libobs/obs-ffmpeg-compat.h | 2 ++
|
||||
plugins/obs-ffmpeg/obs-ffmpeg-compat.h | 2 ++
|
||||
plugins/win-dshow/ffmpeg-decode.c | 2 ++
|
||||
5 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/deps/media-playback/media-playback/decode.c b/deps/media-playback/media-playback/decode.c
|
||||
index 05d6afcc649a2..e1aa9aec0577b 100644
|
||||
--- a/deps/media-playback/media-playback/decode.c
|
||||
+++ b/deps/media-playback/media-playback/decode.c
|
||||
@@ -230,8 +230,10 @@ bool mp_decode_init(mp_media_t *m, enum AVMediaType type, bool hw)
|
||||
d->in_frame = d->sw_frame;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
if (d->codec->capabilities & CODEC_CAP_TRUNC)
|
||||
d->decoder->flags |= CODEC_FLAG_TRUNC;
|
||||
+#endif
|
||||
|
||||
d->orig_pkt = av_packet_alloc();
|
||||
d->pkt = av_packet_alloc();
|
||||
diff --git a/deps/media-playback/media-playback/decode.h b/deps/media-playback/media-playback/decode.h
|
||||
index 1ca271b419fbd..6da34061b3dee 100644
|
||||
--- a/deps/media-playback/media-playback/decode.h
|
||||
+++ b/deps/media-playback/media-playback/decode.h
|
||||
@@ -37,8 +37,10 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 58
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
#define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED
|
||||
#define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED
|
||||
+#endif
|
||||
#else
|
||||
#define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED
|
||||
#define CODEC_FLAG_TRUNC CODEC_FLAG_TRUNCATED
|
||||
diff --git a/libobs/obs-ffmpeg-compat.h b/libobs/obs-ffmpeg-compat.h
|
||||
index c4e23b9851242..ad633521e3b0b 100644
|
||||
--- a/libobs/obs-ffmpeg-compat.h
|
||||
+++ b/libobs/obs-ffmpeg-compat.h
|
||||
@@ -23,8 +23,10 @@
|
||||
#endif
|
||||
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 58
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
#define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED
|
||||
#define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED
|
||||
+#endif
|
||||
#define INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
|
||||
#else
|
||||
#define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED
|
||||
diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h
|
||||
index 181167aff383d..39efa00c774b3 100644
|
||||
--- a/plugins/obs-ffmpeg/obs-ffmpeg-compat.h
|
||||
+++ b/plugins/obs-ffmpeg/obs-ffmpeg-compat.h
|
||||
@@ -27,8 +27,10 @@
|
||||
#endif
|
||||
|
||||
#if LIBAVCODEC_VERSION_MAJOR >= 58
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
#define CODEC_CAP_TRUNC AV_CODEC_CAP_TRUNCATED
|
||||
#define CODEC_FLAG_TRUNC AV_CODEC_FLAG_TRUNCATED
|
||||
+#endif
|
||||
#define CODEC_FLAG_GLOBAL_H AV_CODEC_FLAG_GLOBAL_HEADER
|
||||
#else
|
||||
#define CODEC_CAP_TRUNC CODEC_CAP_TRUNCATED
|
||||
diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c
|
||||
index d27c98441da15..49df62b7a79f2 100644
|
||||
--- a/plugins/win-dshow/ffmpeg-decode.c
|
||||
+++ b/plugins/win-dshow/ffmpeg-decode.c
|
||||
@@ -105,8 +105,10 @@ int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id,
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if LIBAVCODEC_VERSION_MAJOR < 60
|
||||
if (decode->codec->capabilities & CODEC_CAP_TRUNC)
|
||||
decode->decoder->flags |= CODEC_FLAG_TRUNC;
|
||||
+#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -5,11 +5,10 @@
|
|||
# Optional: ffnvcodec-headers jack-audio-connection-kit libva luajit pipewire pulseaudio speexdsp v4l-utils vlc wayland-protocols x265
|
||||
|
||||
name=obs-studio
|
||||
version=29.0.2
|
||||
release=2
|
||||
version=29.1.1
|
||||
release=1
|
||||
source=(https://github.com/obsproject/$name/archive/$version/$name-$version.tar.gz
|
||||
disable-some-plugins.patch
|
||||
2e79d4c9.patch)
|
||||
disable-some-plugins.patch)
|
||||
|
||||
build() {
|
||||
prt-get isinst luajit || PKGMK_OBS+=' -D ENABLE_SCRIPTING_LUA=OFF'
|
||||
|
|
@ -23,7 +22,6 @@ build() {
|
|||
-v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
|
||||
|
||||
patch -Np1 -d $name-$version -i $SRC/disable-some-plugins.patch
|
||||
patch -Np1 -d $name-$version -i $SRC/2e79d4c9.patch
|
||||
|
||||
export QT_QPA_PLATFORMTHEME="qt6ct"
|
||||
cmake -S $name-$version -B build -G Ninja $PKGMK_OBS \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user