Skip to content
Snippets Groups Projects
Verified Commit 266b6ec1 authored by Jan Alexander Steffens (heftig)'s avatar Jan Alexander Steffens (heftig)
Browse files

1.24.2-2: Enable devtools

Fixes: #2
parent 94255b26
No related branches found
No related tags found
No related merge requests found
pkgbase = gstreamer
pkgdesc = Multimedia graph framework
pkgver = 1.24.2
pkgrel = 1
pkgrel = 2
url = https://gstreamer.freedesktop.org/
arch = x86_64
license = LGPL-2.1-or-later
......@@ -133,6 +133,7 @@ pkgbase = gstreamer
makedepends = libmpeg2
makedepends = x264
makedepends = ffmpeg
makedepends = opentimelineio
makedepends = libxrandr
makedepends = python-gobject
makedepends = python-setuptools
......@@ -144,7 +145,7 @@ pkgbase = gstreamer
b2sums = b701d3804d955d217ffefb393488eecdca96e3e1275d7c6997e9bd8ec9155a2aea60faa459e40490b77a16c9031c4f89dd95e5bbb7d7ec4f4e105e090673c0ba
b2sums = b67e5d8c6fb52a794e2307a3944338342ed560895f8fac6876a92d1f81326c751ff5c6f7d6a11e2dde480d981db024fdc0ee4a1638c2af763b10a119887ace95
b2sums = SKIP
b2sums = 50a95a1a312de00f307ba642486da6e33739ec4feac8c6650ea3a0fafeb8f528287098f2dc5f256a08cf1361fcc07c951700094c450c7f67837add05c0cdab4b
b2sums = e7c59c828883a3bb3aa47684d83b57cd4d463e1f8cffc0383f779fa60ecbe37bfa30c8a0f40e6b2a01f6e0edfbefc5b7041340837e0018741e5963671945a1f2
pkgname = gstreamer
pkgdesc = Multimedia graph framework - core
......@@ -347,14 +348,29 @@ pkgname = gst-libav
depends = ffmpeg
provides = gst-ffmpeg=1.24.2
pkgname = gst-devtools-libs
pkgdesc = Multimedia graph framework - development and debugging libraries
depends = gst-plugins-base-libs=1.24.2
depends = json-glib
pkgname = gst-devtools
pkgdesc = Multimedia graph framework - development and debugging tools
depends = gst-devtools-libs=1.24.2
depends = gst-plugins-bad-libs=1.24.2
depends = gst-rtsp-server=1.24.2
depends = gtk3
depends = python-gobject
pkgname = gst-rtsp-server
pkgdesc = Multimedia graph framework - rtsp server
depends = gst-plugins-base-libs=1.24.2
pkgname = gst-editing-services
pkgdesc = Multimedia graph framework - editing services
depends = gst-devtools-libs=1.24.2
depends = gst-plugins-base-libs=1.24.2
depends = python
depends = gst-python=1.24.2
optdepends = opentimelineio: Support for the OpenTimelineIO format
pkgname = gstreamer-vaapi
pkgdesc = Multimedia graph framework - vaapi plugin
......@@ -373,3 +389,5 @@ pkgname = gstreamer-docs
license = LGPL-2.1-or-later
license = MIT
license = OPUBL-1.0
options = !debug
options = !strip
......@@ -4,29 +4,29 @@ Date: Mon, 6 Jun 2022 00:30:08 +0200
Subject: [PATCH] HACK: meson: Disable broken tests
---
subprojects/gst-editing-services/meson.build | 1 -
subprojects/gst-editing-services/tests/check/meson.build | 2 --
subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c | 1 -
subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c | 1 -
subprojects/gst-plugins-bad/tests/check/elements/lc3.c | 3 ---
subprojects/gst-plugins-bad/tests/check/meson.build | 1 -
subprojects/gst-plugins-bad/tests/validate/meson.build | 3 ---
subprojects/gst-plugins-base/tests/validate/meson.build | 1 -
subprojects/gst-plugins-good/tests/check/elements/flvmux.c | 1 -
subprojects/gst-python/meson.build | 1 -
subprojects/gst-rtsp-server/tests/check/meson.build | 2 --
subprojects/gstreamer-vaapi/meson.build | 1 -
9 files changed, 12 deletions(-)
9 files changed, 14 deletions(-)
diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build
index de3daffe6718..85229c0e8db1 100644
--- a/subprojects/gst-editing-services/meson.build
+++ b/subprojects/gst-editing-services/meson.build
@@ -295,7 +295,6 @@ subdir('ges')
subdir('plugins')
subdir('tools')
-subdir('tests')
subdir('examples')
subdir('docs')
diff --git a/subprojects/gst-editing-services/tests/check/meson.build b/subprojects/gst-editing-services/tests/check/meson.build
index 784c592ba6f1..bbf9a2491a86 100644
--- a/subprojects/gst-editing-services/tests/check/meson.build
+++ b/subprojects/gst-editing-services/tests/check/meson.build
@@ -144,7 +144,5 @@ if build_gir
env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
env.set('GI_TYPELIB_PATH', meson.current_build_dir() / '..' / '..' / 'ges')
- test('pythontests', runtests, args: ['--pyunittest-dir', meson.current_source_dir(), 'pyunittest', '--dump-on-failure'],
- env: env)
endif
endif
diff --git a/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c b/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c
index d0901d5b23df..62b3bba4b614 100644
--- a/subprojects/gst-plugins-bad/tests/check/elements/curlhttpsrc.c
......@@ -77,6 +77,38 @@ index 3c64a3641aa7..dc00f8d81b0a 100644
[['elements/shm.c'], not shm_enabled, shm_deps],
[['elements/unixfd.c'], not gio_unix_dep.found()],
[['elements/voaacenc.c'],
diff --git a/subprojects/gst-plugins-bad/tests/validate/meson.build b/subprojects/gst-plugins-bad/tests/validate/meson.build
index c09772a657f4..6dd292ea670a 100644
--- a/subprojects/gst-plugins-bad/tests/validate/meson.build
+++ b/subprojects/gst-plugins-bad/tests/validate/meson.build
@@ -4,15 +4,12 @@ if not gst_tester.found()
endif
tests = [
- {'path': 'opencv/cvtracker'},
{'path': 'testsrcbin/caps_spec'},
{'path': 'codectimestamper/h264_propagate_caps'},
- {'path': 'wpe/load_bytes_first', 'skip': not building_wpe},
{'path': 'vtenc/vtenc_h264', 'skip': not applemedia_found_deps},
{'path': 'vtenc/vtenc_h264_b_frames', 'skip': not applemedia_found_deps},
{'path': 'vtenc/vtenc_h265', 'skip': not applemedia_found_deps},
{'path': 'vtenc/vtenc_h265_b_frames', 'skip': not applemedia_found_deps},
- {'path': 'autovideoconvert/renegotiate'},
]
env = environment()
diff --git a/subprojects/gst-plugins-base/tests/validate/meson.build b/subprojects/gst-plugins-base/tests/validate/meson.build
index f732daae44c5..bc89d8caa676 100644
--- a/subprojects/gst-plugins-base/tests/validate/meson.build
+++ b/subprojects/gst-plugins-base/tests/validate/meson.build
@@ -20,7 +20,6 @@ tests = [
'videorate/duplicate_on_eos',
'videorate/duplicate_on_eos_disbaled',
'videorate/duplicate_on_eos_half_sec',
- 'videorate/fill_segment_after_caps_changed_before_eos',
'videorate/drop_out_of_segment',
'compositor/renogotiate_failing_unsupported_src_format',
'giosrc/read-growing-file',
diff --git a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c b/subprojects/gst-plugins-good/tests/check/elements/flvmux.c
index 6efa928fb09b..1f1950ef323d 100644
--- a/subprojects/gst-plugins-good/tests/check/elements/flvmux.c
......@@ -89,31 +121,6 @@ index 6efa928fb09b..1f1950ef323d 100644
tcase_add_test (tc_chain, test_audio_caps_change_streamable);
tcase_add_test (tc_chain, test_video_caps_change_streamable);
tcase_add_test (tc_chain, test_audio_caps_change_streamable_single);
diff --git a/subprojects/gst-python/meson.build b/subprojects/gst-python/meson.build
index 7ef92be25d6c..9c31465fb548 100644
--- a/subprojects/gst-python/meson.build
+++ b/subprojects/gst-python/meson.build
@@ -132,5 +132,4 @@ if not get_option('plugin').disabled()
endif
endif
if not get_option('tests').disabled()
- subdir('testsuite')
endif
diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build
index 2112da396235..1cbcb861dcf4 100644
--- a/subprojects/gst-rtsp-server/tests/check/meson.build
+++ b/subprojects/gst-rtsp-server/tests/check/meson.build
@@ -28,10 +28,8 @@ rtsp_server_tests = [
'gst/mediafactory',
'gst/media',
'gst/permissions',
- 'gst/rtspserver',
'gst/sessionmedia',
'gst/sessionpool',
- 'gst/stream',
'gst/threadpool',
'gst/token',
'gst/onvif',
diff --git a/subprojects/gstreamer-vaapi/meson.build b/subprojects/gstreamer-vaapi/meson.build
index c470158893f3..cee44f2e7480 100644
--- a/subprojects/gstreamer-vaapi/meson.build
......
......@@ -19,6 +19,8 @@ pkgname=(
gst-plugin-wpe
gst-plugins-ugly
gst-libav
gst-devtools-libs
gst-devtools
gst-rtsp-server
gst-editing-services
gstreamer-vaapi
......@@ -26,7 +28,7 @@ pkgname=(
gstreamer-docs
)
pkgver=1.24.2
pkgrel=1
pkgrel=2
pkgdesc="Multimedia graph framework"
url="https://gstreamer.freedesktop.org/"
arch=(x86_64)
......@@ -65,6 +67,9 @@ makedepends=(
# gst-libav
ffmpeg
# gst-editing-services
opentimelineio
# gstreamer-vaapi
libxrandr
......@@ -80,7 +85,7 @@ source=(
b2sums=('b701d3804d955d217ffefb393488eecdca96e3e1275d7c6997e9bd8ec9155a2aea60faa459e40490b77a16c9031c4f89dd95e5bbb7d7ec4f4e105e090673c0ba'
'b67e5d8c6fb52a794e2307a3944338342ed560895f8fac6876a92d1f81326c751ff5c6f7d6a11e2dde480d981db024fdc0ee4a1638c2af763b10a119887ace95'
'SKIP'
'50a95a1a312de00f307ba642486da6e33739ec4feac8c6650ea3a0fafeb8f528287098f2dc5f256a08cf1361fcc07c951700094c450c7f67837add05c0cdab4b')
'e7c59c828883a3bb3aa47684d83b57cd4d463e1f8cffc0383f779fa60ecbe37bfa30c8a0f40e6b2a01f6e0edfbefc5b7041340837e0018741e5963671945a1f2')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller <tim@gstreamer-foundation.org>
)
......@@ -95,7 +100,6 @@ prepare() {
build() {
local meson_options=(
# Superproject options
-D devtools=disabled
-D examples=disabled
-D gobject-cast-checks=disabled
-D gpl=enabled
......@@ -136,7 +140,7 @@ build() {
-D gst-plugins-bad:wic=disabled
-D gst-plugins-bad:win32ipc=disabled
-D gst-plugins-ugly:sidplay=disabled
-D gst-editing-services:validate=disabled
-D gst-devtools:debug_viewer=enabled
)
# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3197
......@@ -151,6 +155,8 @@ check() (
export XDG_RUNTIME_DIR="$PWD/runtime-dir"
mkdir -p -m 700 "$XDG_RUNTIME_DIR"
export NO_AT_BRIDGE=1 GTK_A11Y=none
# Flaky due to timeouts
xvfb-run -s '-nolisten local' \
meson test -C build --print-errorlogs -t 5
......@@ -696,6 +702,47 @@ package_gst-libav() {
); _install
}
package_gst-devtools-libs() {
pkgdesc+=" - development and debugging libraries"
depends=(
"gst-plugins-base-libs=$pkgver"
json-glib
)
cd root; local files=(
usr/include/gstreamer-1.0/gst/validate
usr/lib/libgstvalidate-*
usr/lib/pkgconfig/gstreamer-validate-1.0.pc
usr/lib/girepository-1.0/GstValidate-1.0.typelib
usr/share/gir-1.0/GstValidate-1.0.gir
); _install
}
package_gst-devtools() {
pkgdesc+=" - development and debugging tools"
depends=(
"gst-devtools-libs=$pkgver"
"gst-plugins-bad-libs=$pkgver"
"gst-rtsp-server=$pkgver"
gtk3 python-gobject
)
cd root; local files=(
usr/bin/gst-validate-*
usr/lib/gst-validate-launcher
usr/lib/gstreamer-1.0/libgstvalidatetracer.so
usr/lib/gstreamer-1.0/validate
usr/share/gstreamer-1.0/validate
usr/bin/gst-debug-viewer
usr/lib/python*/site-packages/GstDebugViewer
usr/share/applications/org.freedesktop.GstDebugViewer.desktop
usr/share/gst-debug-viewer
usr/share/icons/hicolor/*/apps/gst-debug-viewer.*
usr/share/metainfo/org.freedesktop.GstDebugViewer.appdata.xml
); _install
}
package_gst-rtsp-server() {
pkgdesc+=" - rtsp server"
depends=("gst-plugins-base-libs=$pkgver")
......@@ -714,8 +761,12 @@ package_gst-rtsp-server() {
package_gst-editing-services() {
pkgdesc+=" - editing services"
depends=(
"gst-devtools-libs=$pkgver"
"gst-plugins-base-libs=$pkgver"
python
"gst-python=$pkgver"
)
optdepends=(
'opentimelineio: Support for the OpenTimelineIO format'
)
cd root; local files=(
......@@ -772,6 +823,10 @@ package_gstreamer-docs() {
MIT
OPUBL-1.0
)
options=(
!debug
!strip
)
# make sure there are no files left to install
find root -depth ! -type d
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment