From nobody Fri Mar 21 02:12:06 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJmD64Q94z5rfvn; Fri, 21 Mar 2025 02:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJmD63kdhz3Zxg; Fri, 21 Mar 2025 02:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742523126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLX+BNugs74WDQ+ol+Xn8V1bzNaBMc5MMeBSJKSP8nQ=; b=sxJMoMRe91JEtVauMTf1tVX0uFVzATVGl6hAC9eARt0QlacnhAPWRWGKsT8fgVVD0z7uay vs1xFpijMKXfHlgxaZgR6eXrK7sJVRqCcTkL70C3TGx85ZZk1WJ65BE3GEcr8V4ZiGouyi q5DWkZ8ykUYQxs2aWlmY+NVqyrVdy/Yb7ejckNiQeIXRutD3AX4sfGJRLP7eRg8c7co6zw TG802YLl06XLgds7OeQeJWHFzQNUfrF5xI5n/e+EBE39JX/np8YkqmLIdUU3JYEmbm24XG 1PhRxz4/ttFNi8owwfV0Af9d+yXqcx7SrR8cfZaJmaA68iqpd99xJMjyVUDaJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742523126; a=rsa-sha256; cv=none; b=uzDb4jBKzHLV+M9D9kTnsC7mNw+CE2Kn1Un/GtLheMwDcjlkLeSaau0fVxTmkZvK//kzlv m1wyegCgEj2nZ35E+Zh9lP783fs7tncxOhMzcFUjwRJXV19BVTGPuat+UsucRu6bmIj+bP 5wqpKsbdzEOlEYmCh15ToxPLWC8nLPpA2EUras8xdLSAoL1FnheKGPWqpvfS8ekod6i45d W341KH0sl+T9XLNzN6akD54OAXQI8myuG+07m4RpX6xbcM6/FggrqzCytc0HSfIvnAYICa LTHJwkjb+GK0ftoHSR2ju2Wc8Y9qUuBLIS0+cdOnGBB2lWBXbktZsF0okJpMyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742523126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLX+BNugs74WDQ+ol+Xn8V1bzNaBMc5MMeBSJKSP8nQ=; b=GTwglEwUvw32EkymmpuRQXm8+uyrFKE192hm39rhP/p2VpN2bzWC8J8c2Ze0FWoizosR8m bysBOESto1W37vXIn/KpiC/IeHEn3UVhdIMFdBLIXOipDBHjLynroyY/m46B8OvOu20qAT NXDoDvHSurbcz8vUuLG23bolYW6VtwWcnJ2IYEBVqO9EgsCoDrtM6yZpcB34CQZijXIu1R t4RqY/0b7V2k+itwK9P3Zk74q+PTu/hHXE6ovq1oQKmbCI3VYojA86on90ExDzpcdBoOJl PTPzjFdduJCOYnFuLvfdqw+vAd0EgXHknt7ciGrTGlatZxezqaIO/YT/RXc19g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJmD63Hqzz1Np; Fri, 21 Mar 2025 02:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L2C6fe073148; Fri, 21 Mar 2025 02:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L2C6AV073145; Fri, 21 Mar 2025 02:12:06 GMT (envelope-from git) Date: Fri, 21 Mar 2025 02:12:06 GMT Message-Id: <202503210212.52L2C6AV073145@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 1ba9b3ba5b20 - main - GStreamer: Update to 1.26.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ba9b3ba5b2093a52035a3a6fa6e2d9232e691a8 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ba9b3ba5b2093a52035a3a6fa6e2d9232e691a8 commit 1ba9b3ba5b2093a52035a3a6fa6e2d9232e691a8 Author: Jason E. Hale AuthorDate: 2025-03-21 01:20:35 +0000 Commit: Jason E. Hale CommitDate: 2025-03-21 02:11:38 +0000 GStreamer: Update to 1.26.0 https://gstreamer.freedesktop.org/releases/1.26/ --- Mk/Uses/gstreamer.mk | 14 +++++++----- audio/gstreamer1-plugins-flac/Makefile | 2 +- graphics/gstreamer1-plugins-gl/pkg-plist | 1 + graphics/gstreamer1-plugins-vulkan/pkg-plist | 1 - multimedia/gstreamer1-editing-services/Makefile | 1 + multimedia/gstreamer1-editing-services/distinfo | 6 ++--- multimedia/gstreamer1-editing-services/pkg-plist | 2 -- multimedia/gstreamer1-libav/distinfo | 6 ++--- multimedia/gstreamer1-plugins-bad/Makefile | 1 + .../files/patch-ext_dash_meson.build | 4 ++-- .../files/patch-ext_dtls_meson.build | 8 +++---- .../files/patch-ext_hls_meson.build | 4 ++-- .../files/patch-ext_openjpeg_meson.build | 4 ++-- .../files/patch-ext_openmpt_meson.build | 6 ++--- .../files/patch-ext_sctp_meson.build | 8 +++---- .../files/patch-ext_smoothstreaming_meson.build | 4 ++-- .../files/patch-ext_srtp_meson.build | 6 ++--- .../files/patch-ext_vulkan_meson.build | 8 +++---- .../files/patch-ext_webrtc_meson.build | 11 +++++---- .../files/patch-ext_webrtcdsp_meson.build | 6 ++--- .../patch-gst-libs_gst_adaptivedemux_meson.build | 13 +++++------ .../files/patch-gst-libs_gst_analytics_meson.build | 4 ++-- .../files/patch-gst-libs_gst_audio_meson.build | 4 ++-- ...patch-gst-libs_gst_basecamerabinsrc_meson.build | 4 ++-- .../patch-gst-libs_gst_codecparsers_meson.build | 4 ++-- .../files/patch-gst-libs_gst_codecs_meson.build | 6 ++--- .../files/patch-gst-libs_gst_cuda_meson.build | 12 ++++++++++ .../files/patch-gst-libs_gst_dxva_meson.build | 4 ++-- .../files/patch-gst-libs_gst_insertbin_meson.build | 4 ++-- .../files/patch-gst-libs_gst_mpegts_meson.build | 4 ++-- .../files/patch-gst-libs_gst_mse_meson.build | 4 ++-- .../files/patch-gst-libs_gst_play_meson.build | 4 ++-- .../files/patch-gst-libs_gst_player_meson.build | 4 ++-- .../patch-gst-libs_gst_transcoder_meson.build | 4 ++-- .../files/patch-gst-libs_gst_va_meson.build | 6 ++--- .../files/patch-gst-libs_gst_webrtc_meson.build | 4 ++-- .../files/patch-gst_codectimestamper_meson.build | 4 ++-- .../gstreamer1-plugins-bad/files/patch-meson.build | 6 ++--- .../files/patch-meson__options.txt | 6 +++-- .../files/patch-sys_kms_meson.build | 10 ++++----- .../files/patch-sys_msdk_meson.build | 6 ++--- .../files/patch-tests_examples_meson.build | 8 +++++-- multimedia/gstreamer1-plugins-bad/pkg-plist | 8 +++++-- .../files/patch-ext_qt6_meson.build | 4 ++-- .../files/patch-ext_qt_meson.build | 4 ++-- .../files/patch-sys_v4l2_gstv4l2object.c | 4 ++-- .../files/patch-sys_v4l2_v4l2__calls.c | 4 ++-- .../files/patch-meson.build | 26 ++++++++++------------ .../files/patch-meson__options.txt | 4 ++-- multimedia/gstreamer1-plugins/Makefile.common | 2 ++ multimedia/gstreamer1-plugins/distinfo | 18 +++++++-------- .../files/patch-ext_alsa_meson.build | 4 ++-- .../files/patch-ext_cdparanoia_meson.build | 6 ++--- .../files/patch-ext_gl_meson.build | 4 ++-- .../files/patch-ext_libvisual_meson.build | 6 ++--- .../files/patch-ext_ogg_meson.build | 4 ++-- .../files/patch-ext_opus_meson.build | 4 ++-- .../files/patch-ext_pango_meson.build | 4 ++-- .../files/patch-ext_theora_meson.build | 4 ++-- .../files/patch-ext_vorbis_meson.build | 4 ++-- .../patch-gst-libs_gst_allocators_meson.build | 4 ++-- .../files/patch-gst-libs_gst_app_meson.build | 4 ++-- .../files/patch-gst-libs_gst_audio_meson.build | 4 ++-- .../files/patch-gst-libs_gst_gl_meson.build | 6 ++--- .../files/patch-gst-libs_gst_pbutils_meson.build | 4 ++-- .../files/patch-gst-libs_gst_riff_meson.build | 6 ++--- .../files/patch-gst-libs_gst_rtp_meson.build | 4 ++-- .../files/patch-gst-libs_gst_rtsp_meson.build | 4 ++-- .../files/patch-gst-libs_gst_sdp_meson.build | 4 ++-- .../files/patch-gst-libs_gst_tag_meson.build | 4 ++-- .../files/patch-gst-libs_gst_video_meson.build | 4 ++-- .../gstreamer1-plugins/files/patch-meson.build | 8 +++---- .../files/patch-sys_ximage_meson.build | 24 ++++++++++---------- .../files/patch-sys_xvimage_meson.build | 4 ++-- multimedia/gstreamer1-rtsp-server/distinfo | 6 ++--- multimedia/gstreamer1-vaapi/distinfo | 6 ++--- multimedia/gstreamer1/Makefile | 1 - multimedia/gstreamer1/distinfo | 6 ++--- multimedia/gstreamer1/pkg-plist | 11 +++++---- multimedia/py-gstreamer1/Makefile | 1 + multimedia/py-gstreamer1/distinfo | 6 ++--- multimedia/py-gstreamer1/pkg-plist | 4 ++++ 82 files changed, 248 insertions(+), 219 deletions(-) diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index e44fd668c7ea..c6a0c1fc6775 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -48,7 +48,7 @@ _GST_VER= ${_GST_VER_DEFAULT} # - multimedia/gstreamer1-rtsp-server # - multimedia/gstreamer1-vaapi # - multimedia/py-gstreamer1 -_GST1_VERSION= 1.24.12 +_GST1_VERSION= 1.26.0 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 @@ -66,9 +66,9 @@ _GST1_PLUGINS_graphics= aalib cairo gdkpixbuf gl jpeg kms libcaca libvisual \ opencv openexr openjpeg png rsvg vulkan webp zbar _GST1_PLUGINS_multimedia= aom assrender bad dash dts dv dvdread \ editing-services good hls libav libde265 \ - mpeg2dec mpeg2enc mplex mm msdk openh264 resindvd rust \ - smoothstreaming theora ttml ugly v4l2 vaapi vpx webrtc \ - x264 x265 + mpeg2dec mpeg2enc mplex mm msdk openh264 resindvd \ + rtsp-server rust smoothstreaming theora ttml ugly \ + v4l2 vaapi vpx webrtc x264 x265 _GST1_PLUGINS_net= sctp srtp _GST1_PLUGINS_security= dtls _GST1_PLUGINS_sysutils= cdio @@ -104,7 +104,7 @@ gst-bad_IMPL= # gst-core_PORT= multimedia/gstreamer${_GST_VER}-plugins-core gst-core_IMPL= # -gst-core_GST1_VERSION= 1.24 +gst-core_GST1_VERSION= ${_GST1_VERSION:R} gst-core_VERSION= ${gst-core_GST${_GST_VER}_VERSION} gst-good_PORT= multimedia/gstreamer${_GST_VER}-plugins-good @@ -346,6 +346,10 @@ gst-openh264_IMPL= bad gst-resindvd_PORT= multimedia/gstreamer${_GST_VER}-plugins-resindvd gst-resindvd_IMPL= bad +gst-rtsp-server_PORT= multimedia/gstreamer${_GST_VER}-rtsp-server +gst-rtsp-server_SUFFIX= # +gst-rtsp-server_IMPL= # + gst-rust_PORT= multimedia/gstreamer${_GST_VER}-plugins-rust gst-rust_IMPL= # gst-rust_GST1_VERSION= 0.13.4 diff --git a/audio/gstreamer1-plugins-flac/Makefile b/audio/gstreamer1-plugins-flac/Makefile index 2c4bbfac1ff3..1ead6595fb28 100644 --- a/audio/gstreamer1-plugins-flac/Makefile +++ b/audio/gstreamer1-plugins-flac/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= audio COMMENT= GStreamer free lossless audio encoder/decoder plugin diff --git a/graphics/gstreamer1-plugins-gl/pkg-plist b/graphics/gstreamer1-plugins-gl/pkg-plist index eca02b66d81a..c169d0cb82ea 100644 --- a/graphics/gstreamer1-plugins-gl/pkg-plist +++ b/graphics/gstreamer1-plugins-gl/pkg-plist @@ -19,6 +19,7 @@ include/gstreamer-%%VERSION%%/gst/gl/glprototypes/fixedfunction.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gles.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gstgl_compat.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/gstgl_gles2compat.h +include/gstreamer-%%VERSION%%/gst/gl/glprototypes/invalidate_subdata.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/opengl.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/query.h include/gstreamer-%%VERSION%%/gst/gl/glprototypes/shaders.h diff --git a/graphics/gstreamer1-plugins-vulkan/pkg-plist b/graphics/gstreamer1-plugins-vulkan/pkg-plist index 9cca2fb53fe1..f8034a1cfca5 100644 --- a/graphics/gstreamer1-plugins-vulkan/pkg-plist +++ b/graphics/gstreamer1-plugins-vulkan/pkg-plist @@ -6,7 +6,6 @@ include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandbuffer.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandpool.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkconfig.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdebug.h -include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdecoder.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorcache.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorpool.h include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorset.h diff --git a/multimedia/gstreamer1-editing-services/Makefile b/multimedia/gstreamer1-editing-services/Makefile index 80448132a1fd..d2528e9abe2a 100644 --- a/multimedia/gstreamer1-editing-services/Makefile +++ b/multimedia/gstreamer1-editing-services/Makefile @@ -16,6 +16,7 @@ USE_GSTREAMER= bad good USE_LDCONFIG= yes MESON_ARGS= -Ddoc=disabled \ + -Dtests=disabled \ -Dvalidate=disabled \ -Dpygi-overrides-dir=${PYTHON_SITELIBDIR}/gstreamer-editing-services diff --git a/multimedia/gstreamer1-editing-services/distinfo b/multimedia/gstreamer1-editing-services/distinfo index b0295a576919..46b6f3ba651c 100644 --- a/multimedia/gstreamer1-editing-services/distinfo +++ b/multimedia/gstreamer1-editing-services/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738472036 -SHA256 (gst-editing-services-1.24.12.tar.xz) = 688222f270d24be4ed8a3852fa331897db662c7b813fbc39f6deb176b33ec9c0 -SIZE (gst-editing-services-1.24.12.tar.xz) = 857024 +TIMESTAMP = 1742500957 +SHA256 (gst-editing-services-1.26.0.tar.xz) = af5b27f5c9363027372100cac0baf19055280729df1cc58dd4e454ef698eb1ff +SIZE (gst-editing-services-1.26.0.tar.xz) = 836848 diff --git a/multimedia/gstreamer1-editing-services/pkg-plist b/multimedia/gstreamer1-editing-services/pkg-plist index 6c276c5f6d8c..1fe65ec47fb0 100644 --- a/multimedia/gstreamer1-editing-services/pkg-plist +++ b/multimedia/gstreamer1-editing-services/pkg-plist @@ -66,7 +66,6 @@ include/gstreamer-%%VERSION%%/ges/ges-video-uri-source.h include/gstreamer-%%VERSION%%/ges/ges-xml-formatter.h include/gstreamer-%%VERSION%%/ges/ges.h lib/girepository-1.0/GES-%%VERSION%%.typelib -lib/gst-validate-launcher/python/launcher/apps/geslaunch.py lib/gstreamer-%%VERSION%%/libgstges.so lib/gstreamer-%%VERSION%%/libgstnle.so lib/libges-%%VERSION%%.so @@ -76,5 +75,4 @@ lib/libges-%%VERSION%%.so.%%SOVERSION%% libdata/pkgconfig/gst-editing-services-%%VERSION%%.pc %%BASH%%share/bash-completion/completions/ges-launch-%%VERSION%% share/gir-1.0/GES-%%VERSION%%.gir -share/gstreamer-%%VERSION%%/validate/scenarios/ges-edit-clip-while-paused.scenario share/man/man1/ges-launch-%%VERSION%%.1.gz diff --git a/multimedia/gstreamer1-libav/distinfo b/multimedia/gstreamer1-libav/distinfo index b839bb4a5bbd..0f4d73a80fe6 100644 --- a/multimedia/gstreamer1-libav/distinfo +++ b/multimedia/gstreamer1-libav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738472046 -SHA256 (gst-libav-1.24.12.tar.xz) = ef72c1c70a17b3c0bb283d16d09aba496d3401c927dcf5392a8a7866d9336379 -SIZE (gst-libav-1.24.12.tar.xz) = 221148 +TIMESTAMP = 1742500972 +SHA256 (gst-libav-1.26.0.tar.xz) = 707a8b687ff5fddcee5b02415e2ec9b71b4ac44d0b7aec3b477364ceecbf1ecf +SIZE (gst-libav-1.26.0.tar.xz) = 190152 diff --git a/multimedia/gstreamer1-plugins-bad/Makefile b/multimedia/gstreamer1-plugins-bad/Makefile index 56df7a00fd09..dbc4b037536c 100644 --- a/multimedia/gstreamer1-plugins-bad/Makefile +++ b/multimedia/gstreamer1-plugins-bad/Makefile @@ -101,6 +101,7 @@ BAD_GST_ENABLED_PLUGINS=accurip \ speed \ subenc \ switchbin \ + tensordecoders \ timecode \ transcode \ transcoder \ diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_dash_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_dash_meson.build index da6913ecbf4c..22ec3d0bbed1 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_dash_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_dash_meson.build @@ -1,6 +1,6 @@ ---- ext/dash/meson.build.orig 2022-09-13 21:07:32 UTC +--- ext/dash/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/dash/meson.build -@@ -45,9 +45,15 @@ if xml2_dep.found() +@@ -89,9 +89,15 @@ if xml2_dep.found() c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], link_args : noseh_link_args, include_directories : [configinc, libsinc], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_dtls_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_dtls_meson.build index 0fae4cbea15b..837c7e80fb10 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_dtls_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_dtls_meson.build @@ -1,8 +1,8 @@ ---- ext/dtls/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/dtls/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/dtls/meson.build -@@ -12,7 +12,7 @@ dtls_sources = [ - 'gstdtlselement.c', - ] +@@ -34,7 +34,7 @@ plugin_sources += { + 'dtls': pathsep.join(doc_sources) + } -dtls_option = get_option('dtls').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled') +dtls_option = get_option('dtls') diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_hls_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_hls_meson.build index cc1e561b6d3d..895b1e58843f 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_hls_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_hls_meson.build @@ -1,6 +1,6 @@ ---- ext/hls/meson.build.orig 2022-09-16 17:38:38 UTC +--- ext/hls/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/hls/meson.build -@@ -58,7 +58,8 @@ gsthls = library('gsthls', +@@ -78,7 +78,8 @@ gsthls = library('gsthls', link_args : noseh_link_args, include_directories : [configinc], dependencies : [gstpbutils_dep, gsttag_dep, gstvideo_dep, diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openjpeg_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openjpeg_meson.build index 91d6ee280f39..57ae6a2232de 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openjpeg_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openjpeg_meson.build @@ -1,6 +1,6 @@ ---- ext/openjpeg/meson.build.orig 2022-09-12 08:53:57 UTC +--- ext/openjpeg/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/openjpeg/meson.build -@@ -18,7 +18,7 @@ if openjpeg_dep.found() +@@ -33,7 +33,7 @@ if openjpeg_dep.found() link_args : noseh_link_args, include_directories : [configinc], dependencies : [gst_dep, gstvideo_dep, openjpeg_dep, diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openmpt_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openmpt_meson.build index f7b9a0e82bc5..a530c24a987a 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_openmpt_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openmpt_meson.build @@ -1,7 +1,7 @@ ---- ext/openmpt/meson.build.orig 2022-06-15 22:36:22 UTC +--- ext/openmpt/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/openmpt/meson.build -@@ -4,7 +4,7 @@ if openmpt_dep.found() - 'gstopenmptdec.c', 'plugin.c', +@@ -23,7 +23,7 @@ if openmpt_dep.found() + openmpt_sources, c_args: gst_plugins_bad_args, include_directories: [configinc], - dependencies: [gstbadaudio_dep, gstaudio_dep, openmpt_dep], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_sctp_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_sctp_meson.build index efdde9d59811..ad6b23a00655 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_sctp_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_sctp_meson.build @@ -1,8 +1,8 @@ ---- ext/sctp/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/sctp/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/sctp/meson.build -@@ -5,7 +5,7 @@ sctp_sources = [ - 'sctpassociation.c' - ] +@@ -20,7 +20,7 @@ plugin_sources += { + 'sctp': pathsep.join(doc_sources) + } -sctp_option = get_option('sctp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled') +sctp_option = get_option('sctp') diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_smoothstreaming_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_smoothstreaming_meson.build index 53ad3bf562e7..84232ea598d2 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_smoothstreaming_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_smoothstreaming_meson.build @@ -1,6 +1,6 @@ ---- ext/smoothstreaming/meson.build.orig 2022-09-16 20:01:19 UTC +--- ext/smoothstreaming/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/smoothstreaming/meson.build -@@ -13,8 +13,12 @@ if xml28_dep.found() +@@ -28,8 +28,12 @@ if xml28_dep.found() c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], link_args : noseh_link_args, include_directories : [configinc, libsinc], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_srtp_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_srtp_meson.build index 1c839234167d..5a100ae3c312 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_srtp_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_srtp_meson.build @@ -1,7 +1,7 @@ ---- ext/srtp/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/srtp/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/srtp/meson.build -@@ -7,7 +7,7 @@ srtp_cargs = [] - ] +@@ -24,7 +24,7 @@ srtp_cargs = [] + } srtp_cargs = [] -srtp_option = get_option('srtp').enable_if(get_option('webrtc').enabled(), error_message: 'webrtc option is enabled') diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_vulkan_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_vulkan_meson.build index 76206be89206..b52a236a4753 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_vulkan_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_vulkan_meson.build @@ -1,9 +1,9 @@ ---- ext/vulkan/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/vulkan/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/vulkan/meson.build -@@ -37,7 +37,7 @@ if vulkan_conf.get('GST_VULKAN_HAVE_VIDEO_EXTENSIONS') - extra_args = [] +@@ -86,7 +86,7 @@ if vulkan_conf.get('GST_VULKAN_HAVE_VIDEO_EXTENSIONS') + if vulkan_conf.get('GST_VULKAN_HAVE_VIDEO_EXTENSIONS') == 1 - vulkan_sources += files('vkh264dec.c', 'vkh265dec.c') + vulkan_sources += video_sources - extra_deps += gstcodecs_dep + extra_deps += [dependency('gstreamer-codecparsers-1.0'), dependency('gstreamer-codecs-1.0')] extra_args += ['-DGST_USE_UNSTABLE_API'] diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtc_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtc_meson.build index d520d580587e..9df3b38a6c79 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtc_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtc_meson.build @@ -1,13 +1,13 @@ ---- ext/webrtc/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/webrtc/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/webrtc/meson.build @@ -1,3 +1,4 @@ +if get_option('webrtc').enabled() webrtc_sources = [ 'gstwebrtc.c', 'gstwebrtcstats.c', -@@ -12,6 +13,14 @@ webrtc_sources = [ - 'webrtcdatachannel.c', - ] +@@ -35,6 +36,14 @@ plugin_sources += { + 'webrtc': pathsep.join(doc_sources) + } +if not is_variable('libgstwebrtcnice_dep') + subdir_done() @@ -20,7 +20,7 @@ webrtc_option = get_option('webrtc').require( libgstwebrtcnice_dep.found(), error_message: 'webrtc plugin requires libgstwebrtcnice.') if webrtc_option.disabled() -@@ -23,9 +32,9 @@ gstwebrtc_plugin = library('gstwebrtc', +@@ -46,8 +55,9 @@ gstwebrtc_plugin = library('gstwebrtc', c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'], include_directories : [configinc], dependencies : [gstbase_dep, gstsdp_dep, @@ -30,5 +30,4 @@ install_dir : plugins_install_dir, ) plugins += [gstwebrtc_plugin] -- +endif diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build index abcf017a0c6c..a9f29c42b14b 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build @@ -1,6 +1,6 @@ ---- ext/webrtcdsp/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/webrtcdsp/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/webrtcdsp/meson.build -@@ -13,7 +13,7 @@ if webrtc_dep.found() +@@ -49,7 +49,7 @@ if webrtc_dep.found() cpp_args : gst_plugins_bad_args, link_args : noseh_link_args, include_directories : [configinc], @@ -8,4 +8,4 @@ + dependencies : [gstbase_dep, gstaudio_dep, dependency('gstreamer-bad-audio-1.0'), webrtc_dep], install : true, install_dir : plugins_install_dir, - override_options : ['cpp_std=c++17'], + override_options : [default_cppstd], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_adaptivedemux_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_adaptivedemux_meson.build index 99a8f3eafb3e..d0a4914f6446 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_adaptivedemux_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_adaptivedemux_meson.build @@ -1,4 +1,4 @@ ---- gst-libs/gst/adaptivedemux/meson.build.orig 2022-09-05 19:47:37 UTC +--- gst-libs/gst/adaptivedemux/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/adaptivedemux/meson.build @@ -1,5 +1,8 @@ +if get_option('adaptivedemux').enabled() @@ -8,13 +8,10 @@ + 'adaptive-demux-prelude.h') +install_headers(adaptivedemux_headers, subdir : 'gstreamer-1.0/gst/adaptivedemux') - pkg_name = 'gstreamer-adaptivedemux-1.0' - gstadaptivedemux = library('gstadaptivedemux-' + api_version, -@@ -18,4 +21,5 @@ gstadaptivedemux_dep = declare_dependency(link_with : - include_directories : [libsinc], + doc_sources = [] + foreach s: adaptivedemux_sources + adaptivedemux_headers +@@ -29,3 +32,4 @@ meson.override_dependency(pkg_name, gstadaptivedemux_d dependencies : [gstbase_dep, gsturidownloader_dep]) --meson.override_dependency(pkg_name, gstadaptivedemux_dep) -\ No newline at end of file -+meson.override_dependency(pkg_name, gstadaptivedemux_dep) + meson.override_dependency(pkg_name, gstadaptivedemux_dep) +endif diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_analytics_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_analytics_meson.build index a13140d28e3c..6d78dd0153a3 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_analytics_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_analytics_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/analytics/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/analytics/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/analytics/meson.build @@ -1,3 +1,4 @@ +if get_option('analytics').enabled() analytics_sources = files( 'gstanalyticsmeta.c', 'gstanalyticsclassificationmtd.c', 'gstanalyticsobjectdetectionmtd.c', -@@ -62,3 +63,4 @@ meson.override_dependency(pkg_name, gstanalytics_dep) +@@ -78,3 +79,4 @@ meson.override_dependency(pkg_name, gstanalytics_dep) dependencies : [gstbase_dep, gstvideo_dep]) meson.override_dependency(pkg_name, gstanalytics_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_audio_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_audio_meson.build index 0621517df43a..3dae0745c9ba 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_audio_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_audio_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/audio/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/audio/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/audio/meson.build @@ -1,3 +1,4 @@ +if get_option('audio').enabled() badaudio_sources = files('gstnonstreamaudiodecoder.c', 'gstplanaraudioadapter.c') badaudio_headers = files('gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h', 'gstplanaraudioadapter.h') install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio') -@@ -53,3 +54,4 @@ meson.override_dependency(pkg_name, gstbadaudio_dep) +@@ -61,3 +62,4 @@ meson.override_dependency(pkg_name, gstbadaudio_dep) dependencies : [gstaudio_dep, gstbase_dep]) meson.override_dependency(pkg_name, gstbadaudio_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_basecamerabinsrc_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_basecamerabinsrc_meson.build index e55971f7ded9..f03f5c11f55b 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_basecamerabinsrc_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_basecamerabinsrc_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/basecamerabinsrc/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/basecamerabinsrc/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/basecamerabinsrc/meson.build @@ -1,3 +1,4 @@ +if get_option('basecamerabinsrc').enabled() camerabin_sources = files( 'gstcamerabin-enum.c', 'gstcamerabinpreview.c', -@@ -53,3 +54,4 @@ meson.override_dependency(pkg_name, gstbasecamerabin_d +@@ -62,3 +63,4 @@ meson.override_dependency(pkg_name, gstbasecamerabin_d sources: gen_sources, dependencies : [gstapp_dep]) meson.override_dependency(pkg_name, gstbasecamerabin_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecparsers_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecparsers_meson.build index cef5fbc2b1aa..030e3d6929e2 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecparsers_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecparsers_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/codecparsers/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/codecparsers/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/codecparsers/meson.build @@ -1,3 +1,4 @@ +if get_option('codecparsers').enabled() codecparser_sources = files([ 'gstjpeg2000sampling.c', 'gstjpegparser.c', -@@ -72,3 +73,4 @@ meson.override_dependency(pkg_name, gstcodecparsers_de +@@ -87,3 +88,4 @@ meson.override_dependency(pkg_name, gstcodecparsers_de gst_libraries += [[pkg_name, {'lib': gstcodecparsers}]] meson.override_dependency(pkg_name, gstcodecparsers_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecs_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecs_meson.build index 23916ead19c1..7465056b2adb 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecs_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecs_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/codecs/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/codecs/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/codecs/meson.build @@ -1,3 +1,4 @@ +if get_option('codecs').enabled() codecs_sources = files( 'gsth264decoder.c', 'gsth264picture.c', -@@ -51,6 +52,13 @@ pkg_name = 'gstreamer-codecs-1.0' +@@ -64,6 +65,13 @@ pkg_name = 'gstreamer-codecs-1.0' library_def = {'lib': gstcodecs} pkg_name = 'gstreamer-codecs-1.0' @@ -19,7 +19,7 @@ gen_sources = [] if build_gir gir = { -@@ -85,3 +93,4 @@ meson.override_dependency(pkg_name, gstcodecs_dep) +@@ -99,3 +107,4 @@ meson.override_dependency(pkg_name, gstcodecs_dep) sources: gen_sources, dependencies : [gstvideo_dep, gstcodecparsers_dep]) meson.override_dependency(pkg_name, gstcodecs_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build new file mode 100644 index 000000000000..83836091813e --- /dev/null +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_cuda_meson.build @@ -0,0 +1,12 @@ +--- gst-libs/gst/cuda/meson.build.orig 2025-03-11 20:14:44 UTC ++++ gst-libs/gst/cuda/meson.build +@@ -1,3 +1,4 @@ ++if get_option('cuda').enabled() + cuda_sources = files([ + 'gstcudabufferpool.cpp', + 'gstcudacontext.cpp', +@@ -217,3 +218,4 @@ meson.override_dependency(pkg_name, gstcuda_dep) + sources: gen_sources) + + meson.override_dependency(pkg_name, gstcuda_dep) ++endif diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_dxva_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_dxva_meson.build index 95b7c2810ee0..97b82d9773fc 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_dxva_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_dxva_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/dxva/meson.build.orig 2024-10-30 20:33:30 UTC +--- gst-libs/gst/dxva/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/dxva/meson.build @@ -1,3 +1,4 @@ +if get_option('dxva').enabled() dxva_sources = files( 'gstdxvaav1decoder.cpp', 'gstdxvah264decoder.cpp', -@@ -74,3 +75,4 @@ meson.override_dependency(pkg_name, gstdxva_dep) +@@ -83,3 +84,4 @@ meson.override_dependency(pkg_name, gstdxva_dep) dependencies : [gstvideo_dep, gstcodecs_dep]) meson.override_dependency(pkg_name, gstdxva_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_insertbin_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_insertbin_meson.build index a859a3c20369..2a3cea3e7fd2 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_insertbin_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_insertbin_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/insertbin/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/insertbin/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/insertbin/meson.build @@ -1,3 +1,4 @@ +if get_option('insertbin').enabled() insert_sources = files('gstinsertbin.c') insert_headers = files('gstinsertbin.h') install_headers(insert_headers, subdir : 'gstreamer-1.0/gst/insertbin') -@@ -52,3 +53,4 @@ meson.override_dependency(pkg_name, gstinsertbin_dep) +@@ -61,3 +62,4 @@ meson.override_dependency(pkg_name, gstinsertbin_dep) dependencies : [gst_dep]) meson.override_dependency(pkg_name, gstinsertbin_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mpegts_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mpegts_meson.build index 3d0306698f6c..4ccb79091a19 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mpegts_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mpegts_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/mpegts/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/mpegts/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/mpegts/meson.build @@ -1,3 +1,4 @@ +if get_option('mpegts').enabled() mpegts_sources = files( 'mpegts.c', 'gstmpegtssection.c', -@@ -87,3 +88,4 @@ meson.override_dependency(pkg_name, gstmpegts_dep) +@@ -92,3 +93,4 @@ meson.override_dependency(pkg_name, gstmpegts_dep) dependencies : [gst_dep], sources : gen_sources) meson.override_dependency(pkg_name, gstmpegts_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mse_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mse_meson.build index 87fa32dc173c..d067281d5395 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mse_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mse_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/mse/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/mse/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/mse/meson.build @@ -1,3 +1,4 @@ +if get_option('mse').enabled() gstmse_headers_private = files( 'gstappendpipeline-private.h', 'gstmediasourcesamplemap-private.h', -@@ -148,3 +149,4 @@ meson.override_dependency(pkg_name, gstmse_dep) +@@ -156,3 +157,4 @@ meson.override_dependency(pkg_name, gstmse_dep) ) install_headers(gstmse_headers_public, subdir: gstmse_header_dir) meson.override_dependency(pkg_name, gstmse_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_play_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_play_meson.build index d06564fe48d5..150a88c2a13d 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_play_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_play_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/play/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/play/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/play/meson.build @@ -1,3 +1,4 @@ +if get_option('play').enabled() gstplay_sources = files( 'gstplay.c', 'gstplay-signal-adapter.c', -@@ -75,3 +76,4 @@ meson.override_dependency(pkg_name, gstplay_dep) +@@ -84,3 +85,4 @@ meson.override_dependency(pkg_name, gstplay_dep) gsttag_dep, gstpbutils_dep]) meson.override_dependency(pkg_name, gstplay_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_player_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_player_meson.build index 24847d7836ab..9dccccc5242c 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_player_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_player_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/player/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/player/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/player/meson.build @@ -1,3 +1,4 @@ +if get_option('player').enabled() gstplayer_sources = files([ 'gstplayer.c', 'gstplayer-signal-dispatcher.c', -@@ -78,3 +79,4 @@ meson.override_dependency(pkg_name, gstplayer_dep) +@@ -87,3 +88,4 @@ meson.override_dependency(pkg_name, gstplayer_dep) gsttag_dep, gstpbutils_dep]) meson.override_dependency(pkg_name, gstplayer_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_transcoder_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_transcoder_meson.build index 67655adb60a0..d1643445ccde 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_transcoder_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_transcoder_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/transcoder/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/transcoder/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/transcoder/meson.build @@ -1,3 +1,4 @@ +if get_option('transcoder').enabled() sources = files(['gsttranscoder.c', 'gsttranscoder-signal-adapter.c']) headers = files(['gsttranscoder.h', 'transcoder-prelude.h', 'gsttranscoder-signal-adapter.h']) -@@ -65,3 +66,4 @@ meson.override_dependency(pkg_name, gst_transcoder_dep +@@ -74,3 +75,4 @@ meson.override_dependency(pkg_name, gst_transcoder_dep include_directories : [libsinc] ) meson.override_dependency(pkg_name, gst_transcoder_dep) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_va_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_va_meson.build index 40c7e4d6856c..7c9aa184d9c0 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_va_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_va_meson.build @@ -1,6 +1,6 @@ ---- gst-libs/gst/va/meson.build.orig 2024-10-30 20:33:30 UTC +--- gst-libs/gst/va/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/va/meson.build -@@ -45,12 +45,12 @@ extra_args = ['-DGST_USE_UNSTABLE_API', +@@ -54,12 +54,12 @@ extra_args = ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', '-DG_LOG_DOMAIN="GStreamer-VA"'] @@ -15,7 +15,7 @@ msdk_opt = get_option('msdk') qsv_opt = get_option('qsv') if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled() -@@ -74,7 +74,7 @@ endif +@@ -83,7 +83,7 @@ endif subdir_done() endif diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_meson.build index 2322d4300ca3..9313f4dbb5eb 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_webrtc_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/webrtc/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/webrtc/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst-libs/gst/webrtc/meson.build @@ -1,3 +1,4 @@ +if get_option('webrtc').enabled() webrtc_sources = files([ 'dtlstransport.c', 'ice.c', -@@ -104,3 +105,4 @@ subdir('nice') +@@ -113,3 +114,4 @@ subdir('nice') meson.override_dependency(pkg_name, gstwebrtc_dep) subdir('nice') diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-gst_codectimestamper_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst_codectimestamper_meson.build index 3528291dedf8..22589c9ab4d9 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-gst_codectimestamper_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-gst_codectimestamper_meson.build @@ -1,6 +1,6 @@ ---- gst/codectimestamper/meson.build.orig 2023-02-28 08:03:28 UTC +--- gst/codectimestamper/meson.build.orig 2025-03-11 20:14:44 UTC +++ gst/codectimestamper/meson.build -@@ -9,7 +9,8 @@ gstcodectimestamper = library('gstcodectimestamper', +@@ -28,7 +28,8 @@ gstcodectimestamper = library('gstcodectimestamper', codectimestamper_sources, c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ], include_directories : [configinc], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-meson.build index 8bf5d60b1cdb..2d8e66bbec9e 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-meson.build @@ -1,6 +1,6 @@ ---- meson.build.orig 2024-10-30 20:33:30 UTC +--- meson.build.orig 2025-03-11 20:14:44 UTC +++ meson.build -@@ -556,6 +556,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] +@@ -567,6 +567,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] pkgconfig_subdirs = ['gstreamer-1.0'] @@ -8,7 +8,7 @@ pkgconfig.generate( libraries : [gst_dep], variables : pkgconfig_variables, -@@ -563,6 +564,7 @@ pkgconfig.generate( +@@ -574,6 +575,7 @@ pkgconfig.generate( name : 'gstreamer-plugins-bad-1.0', description : 'Streaming media framework, bad plugins libraries', ) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-meson__options.txt b/multimedia/gstreamer1-plugins-bad/files/patch-meson__options.txt index 61a716560457..0a0482c2e251 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-meson__options.txt +++ b/multimedia/gstreamer1-plugins-bad/files/patch-meson__options.txt @@ -1,6 +1,6 @@ ---- meson_options.txt.orig 2024-08-21 11:25:15 UTC +--- meson_options.txt.orig 2025-03-11 20:14:44 UTC +++ meson_options.txt -@@ -1,5 +1,47 @@ option('gst_play_tests', type: 'boolean', value: false +@@ -1,5 +1,49 @@ option('gst_play_tests', type: 'boolean', value: false option('gst_play_tests', type: 'boolean', value: false, description: 'Enable GstPlay tests that need network access') +option('adaptivedemux', type: 'feature', value: 'auto', @@ -13,6 +13,8 @@ + description: 'codecparsers lib') +option('codecs', type: 'feature', value: 'auto', + description: 'codecs lib') ++option('cuda', type: 'feature', value: 'auto', ++ description: 'cuda lib') +option('dxva', type: 'feature', value: 'auto', + description: 'dxva lib') +option('basecamerabinsrc', type: 'feature', value: 'auto', diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-sys_kms_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-sys_kms_meson.build index b3076c8ecfbd..fd2714c6d5e9 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-sys_kms_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-sys_kms_meson.build @@ -1,13 +1,13 @@ ---- sys/kms/meson.build.orig 2024-08-21 11:25:15 UTC +--- sys/kms/meson.build.orig 2025-03-11 20:14:44 UTC +++ sys/kms/meson.build -@@ -6,10 +6,6 @@ extra_deps = [] - ] +@@ -25,10 +25,6 @@ extra_deps = [] + extra_deps = [] -if host_system != 'linux' - subdir_done() -endif - - libdrm_dep = dependency('libdrm', version : '>= 2.4.98', + libdrm_dep = dependency('libdrm', version : '>= 2.4.108', required : get_option('kms')) - libdrm_hdr_dep = dependency('libdrm', version : '>= 2.4.104', + mathlib = cc.find_library('m', required : false) diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-sys_msdk_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-sys_msdk_meson.build index 94bc06f4fb25..c382989fb296 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-sys_msdk_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-sys_msdk_meson.build @@ -1,6 +1,6 @@ ---- sys/msdk/meson.build.orig 2024-10-30 20:33:30 UTC +--- sys/msdk/meson.build.orig 2025-03-11 20:14:44 UTC +++ sys/msdk/meson.build -@@ -185,7 +185,7 @@ else +@@ -253,7 +253,7 @@ else libdl_dep = cc.find_library('dl', required: get_option('msdk')) libgudev_dep = dependency('gudev-1.0', required: get_option('msdk'), allow_fallback: true) msdk_deps = declare_dependency(dependencies: [gstva_dep, libdl_dep, libgudev_dep, libdrm_dep]) @@ -9,7 +9,7 @@ endif if msdk_deps_found -@@ -201,7 +201,12 @@ if msdk_deps_found +@@ -269,7 +269,12 @@ if msdk_deps_found msdk_sources, c_args : gst_plugins_bad_args + extra_args + onevpl_extra_args, include_directories : [configinc, mfx_inc], diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-tests_examples_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-tests_examples_meson.build index 1c89b5b6efb1..a70c96809497 100644 --- a/multimedia/gstreamer1-plugins-bad/files/patch-tests_examples_meson.build +++ b/multimedia/gstreamer1-plugins-bad/files/patch-tests_examples_meson.build @@ -1,11 +1,12 @@ ---- tests/examples/meson.build.orig 2024-09-19 10:01:21 UTC +--- tests/examples/meson.build.orig 2025-03-11 20:14:44 UTC +++ tests/examples/meson.build -@@ -1,26 +1,72 @@ +@@ -1,27 +1,75 @@ -subdir('audiomixmatrix') -subdir('avsamplesink') -subdir('camerabin2') -subdir('codecparsers') -subdir('codecs') +-subdir('cuda') -subdir('d3d11') -subdir('d3d12') -subdir('directfb') @@ -39,6 +40,9 @@ +if get_option('codecs').enabled() + subdir('codecs') +endif ++if get_option('cuda').enabled() ++ subdir('cuda') ++endif +if get_option('d3d11').enabled() + subdir('d3d11') +endif diff --git a/multimedia/gstreamer1-plugins-bad/pkg-plist b/multimedia/gstreamer1-plugins-bad/pkg-plist index 2bcc6ed5e11c..50ad41f1fadd 100644 --- a/multimedia/gstreamer1-plugins-bad/pkg-plist +++ b/multimedia/gstreamer1-plugins-bad/pkg-plist @@ -7,6 +7,9 @@ include/gstreamer-%%VERSION%%/gst/analytics/gstanalyticsclassificationmtd.h include/gstreamer-%%VERSION%%/gst/analytics/gstanalyticsmeta.h include/gstreamer-%%VERSION%%/gst/analytics/gstanalyticsobjectdetectionmtd.h include/gstreamer-%%VERSION%%/gst/analytics/gstanalyticsobjecttrackingmtd.h +include/gstreamer-%%VERSION%%/gst/analytics/gstanalyticssegmentationmtd.h +include/gstreamer-%%VERSION%%/gst/analytics/gsttensor.h +include/gstreamer-%%VERSION%%/gst/analytics/gsttensormeta.h include/gstreamer-%%VERSION%%/gst/audio/audio-bad-prelude.h include/gstreamer-%%VERSION%%/gst/audio/gstnonstreamaudiodecoder.h include/gstreamer-%%VERSION%%/gst/audio/gstplanaraudioadapter.h @@ -18,8 +21,10 @@ include/gstreamer-%%VERSION%%/gst/codecparsers/codecparsers-prelude.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstav1parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gsth265parser.h +include/gstreamer-%%VERSION%%/gst/codecparsers/gsth266parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstjpeg2000sampling.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstjpegparser.h +include/gstreamer-%%VERSION%%/gst/codecparsers/gstlcevcmeta.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpeg4parser.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideometa.h include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideoparser.h @@ -38,8 +43,6 @@ include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-descriptor.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-section.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-hdmv-section.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-isdb-descriptor.h -include/gstreamer-%%VERSION%%/gst/mpegts/gst-metadata-descriptor.h -include/gstreamer-%%VERSION%%/gst/mpegts/gst-mpegtspesmetadatameta.h include/gstreamer-%%VERSION%%/gst/mpegts/gst-scte-section.h include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegts-enumtypes.h include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h @@ -157,6 +160,7 @@ lib/gstreamer-%%VERSION%%/libgstsmooth.so lib/gstreamer-%%VERSION%%/libgstspeed.so lib/gstreamer-%%VERSION%%/libgstsubenc.so lib/gstreamer-%%VERSION%%/libgstswitchbin.so +lib/gstreamer-%%VERSION%%/libgsttensordecoders.so lib/gstreamer-%%VERSION%%/libgsttimecode.so lib/gstreamer-%%VERSION%%/libgsttranscode.so lib/gstreamer-%%VERSION%%/libgstunixfd.so diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt6_meson.build b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt6_meson.build index 729d0a475f00..6f040bd8b926 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt6_meson.build +++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt6_meson.build @@ -1,6 +1,6 @@ ---- ext/qt6/meson.build.orig 2024-09-19 10:01:21 UTC +--- ext/qt6/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/qt6/meson.build -@@ -112,7 +112,7 @@ qt6_egl = qt6_egl \ +@@ -142,7 +142,7 @@ qt6_egl = qt6_egl \ # EGL windowing for Embedded linux (e.g. i.MX6) with or without windowing # support qt6_egl = qt6_egl \ diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_meson.build b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_meson.build index c46a55a3f941..b72f7f96df54 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_meson.build +++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_meson.build @@ -1,6 +1,6 @@ ---- ext/qt/meson.build.orig 2024-09-19 10:01:21 UTC +--- ext/qt/meson.build.orig 2025-03-11 20:14:44 UTC +++ ext/qt/meson.build -@@ -105,7 +105,7 @@ qt5_egl = qt5_egl \ +@@ -132,7 +132,7 @@ qt5_egl = qt5_egl \ # EGL windowing for Embedded linux (e.g. i.MX6) with or without windowing # support qt5_egl = qt5_egl \ diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c index cc7cde6c3e8b..1eb3b635f7b6 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c +++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_gstv4l2object.c @@ -1,6 +1,6 @@ ---- sys/v4l2/gstv4l2object.c.orig 2024-09-19 10:01:21 UTC +--- sys/v4l2/gstv4l2object.c.orig 2025-03-11 20:14:44 UTC +++ sys/v4l2/gstv4l2object.c -@@ -5078,7 +5078,9 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object +@@ -5262,7 +5262,9 @@ gst_v4l2_object_probe_caps (GstV4l2Object * v4l2object if (v4l2object->ioctl (v4l2object->video_fd, VIDIOC_CROPCAP, &cropcap) < 0) { switch (errno) { diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2__calls.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2__calls.c index 95f1b0270bd7..a5cf98683374 100644 --- a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2__calls.c +++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2__calls.c @@ -1,6 +1,6 @@ ---- sys/v4l2/v4l2_calls.c.orig 2024-08-21 11:25:15 UTC +--- sys/v4l2/v4l2_calls.c.orig 2025-03-11 20:14:44 UTC +++ sys/v4l2/v4l2_calls.c -@@ -1334,10 +1334,12 @@ gst_v4l2_query_dv_timings (GstV4l2Object * v4l2object, +@@ -1333,10 +1333,12 @@ gst_v4l2_query_dv_timings (GstV4l2Object * v4l2object, if (ret < 0) { switch (errno) { diff --git a/multimedia/gstreamer1-plugins-ugly/files/patch-meson.build b/multimedia/gstreamer1-plugins-ugly/files/patch-meson.build index f42f5c6f266b..314a84155335 100644 --- a/multimedia/gstreamer1-plugins-ugly/files/patch-meson.build +++ b/multimedia/gstreamer1-plugins-ugly/files/patch-meson.build @@ -1,14 +1,12 @@ -*** meson.build.orig Fri Sep 2 18:21:32 2022 ---- meson.build Fri Sep 2 18:24:38 2022 -*************** -*** 117,122 **** ---- 117,125 ---- - cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-ugly-1.0') - cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) - -+ cdata.set_quoted('DEFAULT_AUDIOSINK', get_option('defaultaudiosink')) -+ cdata.set_quoted('DEFAULT_AUDIOSRC', get_option('defaultaudiosrc')) -+ - # GStreamer package name and origin url - gst_package_name = get_option('package-name') - if gst_package_name == '' *** 613 LINES SKIPPED ***