From nobody Fri Nov 8 01:26:12 2024 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 4Xl1VX46r6z5d0d2; Fri, 08 Nov 2024 01:26:12 +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 4Xl1VX2R5Qz4YwX; Fri, 8 Nov 2024 01:26:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731029172; 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=difkYa3opgsZnGzHt4oP9Pdopd0LkItAoNzGsUVwW30=; b=vTgkc61dNRSzx84Is2ceqAvMYjSkrTmWDNuarUREdhcaM4xi3/IdEcbwY6p/zFpTqZ2mS3 PVn25r0auxK46jc7vhO0mo12ogoG1jti/koUEs/cUTyfrmHl6YUWsaQMx++1YzdAOH6Raq kn4WqunmMTS1/7WNMFQOrx9VpuR9VAJYe/nCozcp6nKWp0X1Qgeq2L1+ppB9WPowvqdrH+ sC8plpfONo2KBAxnvRp2lWLoEFmfh4WunHUjF3ulvJSi0/2I1R56LtK6PgC5iRDdX0ZmWD Gl0uZ7EoTn1upyivSm5u+RPX1qOLqr+SSzle6C6y3ZUd4U5kV7jCP/olPOKgbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731029172; 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=difkYa3opgsZnGzHt4oP9Pdopd0LkItAoNzGsUVwW30=; b=QwUQr+UgVz5zH1+33NJ+PhtBJDmVyzfVqKMuc7l7w06jgZamNon2eY0BOr37O7K1w/O8WC GHNN2yrqNbvEhxZJSZL0AtXLU6YsMQ5akow/Zyon812t6pBhkPv5OJolPRB8ZtOoU63RIp Jhx3hL4xI2XNUMnVWrkYXLkG6yp27Ij8oebbcg7Nc3Gb73ZmR5UzJdNxPiD7PanU4adRrj NhTMidYepqIoYOtGq3+awkMYXVt706zibGx566X41JD9W0C6v0M2qntz85jRpT6gfTw3h5 UiAGlB8MZWD0wWe5crwWlOLEPTIv1vbjEYoj7j4EKBINOybyqQL0AApBstvcow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731029172; a=rsa-sha256; cv=none; b=LaERGwku4IMpgSi3zNq3J5Ar3GBGgWLUlK9r6wRlIDOpclp0kjsc5DOa7IFAkBkuCvjeOd u0dN1xqUZjw4qR5Dd/EJbdUw5WwcRx7PPmXi5QhvX8V4yw0fqUW9fxKqt9Qujd3z8a5Y2L lWpVOA4L4IVl0VfZnM90sIQbx6msKKltBe8XENmbyh9lzjLxacaD3l6VetGf+P4cLGAKgU 9vOneLTiNStHn1nnpyHK49ehQMKG4stQ8ciRIHQEPKhdnd+K48H13V3Fpu83dmShR5nMDg Dj8uo3ayyOdogRY6HIYUyvQEHUBJXj6NirUWIBfzRTamUk5Rvq9YCEC3hPBe0w== 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 4Xl1VX22vMz18LL; Fri, 8 Nov 2024 01:26:12 +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 4A81QCXu055461; Fri, 8 Nov 2024 01:26:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A81QCt2055458; Fri, 8 Nov 2024 01:26:12 GMT (envelope-from git) Date: Fri, 8 Nov 2024 01:26:12 GMT Message-Id: <202411080126.4A81QCt2055458@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: 9033cb222f3c - main - Gstreamer: Update to 1.24.9 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: 9033cb222f3c1cbd9aa9a12827f0de4942cafec9 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9033cb222f3c1cbd9aa9a12827f0de4942cafec9 commit 9033cb222f3c1cbd9aa9a12827f0de4942cafec9 Author: Jason E. Hale AuthorDate: 2024-11-07 07:20:37 +0000 Commit: Jason E. Hale CommitDate: 2024-11-08 01:23:35 +0000 Gstreamer: Update to 1.24.9 https://gstreamer.freedesktop.org/releases/1.24/#1.24.9 Security: d48a2224-9b4c-11ef-bdd9-4ccc6adda413 --- Mk/Uses/gstreamer.mk | 3 +- audio/gstreamer1-plugins-openmpt/Makefile | 2 +- graphics/gstreamer1-plugins-gl/Makefile | 2 +- graphics/gstreamer1-plugins-openexr/Makefile | 2 +- multimedia/gstreamer1-editing-services/distinfo | 6 +- multimedia/gstreamer1-libav/distinfo | 6 +- .../files/patch-gst-libs_gst_dxva_meson.build | 4 +- .../files/patch-gst-libs_gst_va_meson.build | 8 +-- .../gstreamer1-plugins-bad/files/patch-meson.build | 6 +- .../files/patch-sys_msdk_meson.build | 13 +++- multimedia/gstreamer1-plugins-mpeg2enc/Makefile | 2 +- multimedia/gstreamer1-plugins-mplex/Makefile | 2 +- multimedia/gstreamer1-plugins-vpx/Makefile | 2 +- multimedia/gstreamer1-plugins-x265/Makefile | 2 +- multimedia/gstreamer1-plugins/Makefile | 1 + multimedia/gstreamer1-plugins/distinfo | 18 ++--- .../files/patch-ext_gl_meson.build | 30 +++----- .../files/patch-gst-libs_gst_gl_meson.build | 80 ++++------------------ .../files/patch-tools_meson.build | 8 +-- multimedia/gstreamer1-rtsp-server/distinfo | 6 +- multimedia/gstreamer1-vaapi/distinfo | 6 +- multimedia/gstreamer1/distinfo | 6 +- multimedia/py-gstreamer1/distinfo | 6 +- 23 files changed, 83 insertions(+), 138 deletions(-) diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk index 2854893f3f82..f1347c0de0be 100644 --- a/Mk/Uses/gstreamer.mk +++ b/Mk/Uses/gstreamer.mk @@ -43,11 +43,12 @@ _GST_VER= ${_GST_VER_DEFAULT} # following ports: # - multimedia/gstreamer1 # - multimedia/gstreamer1-editing-services +# - multimedia/gstreamer1-libav # - multimedia/gstreamer1-plugins (via `make makesum-gst1`) # - multimedia/gstreamer1-rtsp-server # - multimedia/gstreamer1-vaapi # - multimedia/py-gstreamer1 -_GST1_VERSION= 1.24.8 +_GST1_VERSION= 1.24.9 _GST1_LIB_VER= 1.0 _GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0 diff --git a/audio/gstreamer1-plugins-openmpt/Makefile b/audio/gstreamer1-plugins-openmpt/Makefile index 359284103f50..26b2ae90f052 100644 --- a/audio/gstreamer1-plugins-openmpt/Makefile +++ b/audio/gstreamer1-plugins-openmpt/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= audio COMMENT= GStreamer OpenMPT audio decoder plugin diff --git a/graphics/gstreamer1-plugins-gl/Makefile b/graphics/gstreamer1-plugins-gl/Makefile index aca512117815..47c01cbb2ae7 100644 --- a/graphics/gstreamer1-plugins-gl/Makefile +++ b/graphics/gstreamer1-plugins-gl/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= GStreamer GL graphics plugin diff --git a/graphics/gstreamer1-plugins-openexr/Makefile b/graphics/gstreamer1-plugins-openexr/Makefile index b916f31f76fc..3e63d57ad993 100644 --- a/graphics/gstreamer1-plugins-openexr/Makefile +++ b/graphics/gstreamer1-plugins-openexr/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= graphics COMMENT= GStreamer OpenExr codec plugin diff --git a/multimedia/gstreamer1-editing-services/distinfo b/multimedia/gstreamer1-editing-services/distinfo index e40c6daada62..441e30540bd0 100644 --- a/multimedia/gstreamer1-editing-services/distinfo +++ b/multimedia/gstreamer1-editing-services/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726789247 -SHA256 (gst-editing-services-1.24.8.tar.xz) = b30a82e496975a9d821ce1c5b0cb846fd53e038bb390f9e1e0aa5e01efc217e2 -SIZE (gst-editing-services-1.24.8.tar.xz) = 850280 +TIMESTAMP = 1730792843 +SHA256 (gst-editing-services-1.24.9.tar.xz) = 07506e53bec6c54ec1dfaa5033bad8df42d2f217451822b4c8bf783ef8a27012 +SIZE (gst-editing-services-1.24.9.tar.xz) = 852364 diff --git a/multimedia/gstreamer1-libav/distinfo b/multimedia/gstreamer1-libav/distinfo index 25996f16970a..c724b39d1a56 100644 --- a/multimedia/gstreamer1-libav/distinfo +++ b/multimedia/gstreamer1-libav/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726789274 -SHA256 (gst-libav-1.24.8.tar.xz) = 1e4a8fd537621d236442cf90a6e9ad5e00f87bffffdaeb1fd8bfd23719de8c75 -SIZE (gst-libav-1.24.8.tar.xz) = 213160 +TIMESTAMP = 1730795279 +SHA256 (gst-libav-1.24.9.tar.xz) = 32682e9ae508ee01f4fb134b3a520081e2ac007220997577624b1d16171d456c +SIZE (gst-libav-1.24.9.tar.xz) = 215252 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 46b6b26500dd..95b7c2810ee0 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-08-21 11:25:15 UTC +--- gst-libs/gst/dxva/meson.build.orig 2024-10-30 20:33:30 UTC +++ gst-libs/gst/dxva/meson.build @@ -1,3 +1,4 @@ +if get_option('dxva').enabled() dxva_sources = files( 'gstdxvaav1decoder.cpp', 'gstdxvah264decoder.cpp', -@@ -73,3 +74,4 @@ meson.override_dependency(pkg_name, gstdxva_dep) +@@ -74,3 +75,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_va_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_va_meson.build index 1a6d4c6b0deb..40c7e4d6856c 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,4 +1,4 @@ ---- gst-libs/gst/va/meson.build.orig 2024-09-19 10:01:21 UTC +--- gst-libs/gst/va/meson.build.orig 2024-10-30 20:33:30 UTC +++ gst-libs/gst/va/meson.build @@ -45,12 +45,12 @@ extra_args = ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_VA', @@ -15,12 +15,12 @@ msdk_opt = get_option('msdk') qsv_opt = get_option('qsv') if va_opt.disabled() and msdk_opt.disabled() and qsv_opt.disabled() -@@ -75,7 +75,7 @@ endif +@@ -74,7 +74,7 @@ endif subdir_done() endif -if host_system == 'linux' +if host_system in ['linux', 'freebsd'] - libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required, - fallback: ['libva', 'libva_drm_dep']) + libva_drm_dep = dependency('libva-drm', version: libva_req, required: va_required) if not libva_drm_dep.found() + subdir_done() diff --git a/multimedia/gstreamer1-plugins-bad/files/patch-meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-meson.build index a252c8b451e8..8bf5d60b1cdb 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-08-21 11:25:15 UTC +--- meson.build.orig 2024-10-30 20:33:30 UTC +++ meson.build -@@ -545,6 +545,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] +@@ -556,6 +556,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] pkgconfig_subdirs = ['gstreamer-1.0'] @@ -8,7 +8,7 @@ pkgconfig.generate( libraries : [gst_dep], variables : pkgconfig_variables, -@@ -552,6 +553,7 @@ pkgconfig.generate( +@@ -563,6 +564,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-sys_msdk_meson.build b/multimedia/gstreamer1-plugins-bad/files/patch-sys_msdk_meson.build index c60e827edda4..94bc06f4fb25 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,15 @@ ---- sys/msdk/meson.build.orig 2024-08-21 11:25:15 UTC +--- sys/msdk/meson.build.orig 2024-10-30 20:33:30 UTC +++ sys/msdk/meson.build -@@ -202,7 +202,12 @@ if msdk_deps_found +@@ -185,7 +185,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]) +- msdk_deps_found = gstva_dep.found() and libdl_dep.found() and libgudev_dep.found() and libdrm_dep.found() ++ msdk_deps_found = gstva_dep.found() and libdl_dep.found() and libgudev_dep.found() + endif + + if msdk_deps_found +@@ -201,7 +201,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-mpeg2enc/Makefile b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile index daf6560cccbf..5dec4a490910 100644 --- a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile +++ b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= GStreamer mpeg encoder plugin diff --git a/multimedia/gstreamer1-plugins-mplex/Makefile b/multimedia/gstreamer1-plugins-mplex/Makefile index ff9aacec79c3..9b7cfaee3c71 100644 --- a/multimedia/gstreamer1-plugins-mplex/Makefile +++ b/multimedia/gstreamer1-plugins-mplex/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= GStreamer mplex plugin diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile index 60fa49766a3a..4987bc13b523 100644 --- a/multimedia/gstreamer1-plugins-vpx/Makefile +++ b/multimedia/gstreamer1-plugins-vpx/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= GStreamer vp8 codec plugin diff --git a/multimedia/gstreamer1-plugins-x265/Makefile b/multimedia/gstreamer1-plugins-x265/Makefile index a50f939802a3..eb5726638193 100644 --- a/multimedia/gstreamer1-plugins-x265/Makefile +++ b/multimedia/gstreamer1-plugins-x265/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= multimedia COMMENT= GStreamer libx265 based H265 plugin diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index 8c938409e92b..fbfca2015936 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -112,6 +112,7 @@ WRKSRC= ${WRKDIR}/${BASE_DISTNAME} PORTVERSION= ${BASE_PORTVERSION} DISTFILES+= ${BASE_DISTFILE}:base PATCHDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins/files +LIB_DEPENDS+= libdrm.so:graphics/libdrm .elif ${DIST} == "bad" EXTRACT_ONLY= ${BAD_DISTFILE} WRKSRC= ${WRKDIR}/${BAD_DISTNAME} diff --git a/multimedia/gstreamer1-plugins/distinfo b/multimedia/gstreamer1-plugins/distinfo index 866d46797b37..f09258111013 100644 --- a/multimedia/gstreamer1-plugins/distinfo +++ b/multimedia/gstreamer1-plugins/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1726789410 -SHA256 (gst-plugins-base-1.24.8.tar.xz) = 10fb31743750ccd498d3933e8aaecda563ebc65596a6ab875b47ee936e4b9599 -SIZE (gst-plugins-base-1.24.8.tar.xz) = 2439740 -SHA256 (gst-plugins-bad-1.24.8.tar.xz) = 35ad70de3d7cbca3089f33bb77c45750daad2ae93d79827fdbb469fa8aba84eb -SIZE (gst-plugins-bad-1.24.8.tar.xz) = 7069792 -SHA256 (gst-plugins-ugly-1.24.8.tar.xz) = 3dfc12bf0b766682b7d6e1e29a404b55e2375ba172d11900179738ae89b7a2d5 -SIZE (gst-plugins-ugly-1.24.8.tar.xz) = 227100 -SHA256 (gst-plugins-good-1.24.8.tar.xz) = 613a20f03bd4544b52f10f6ceb4e0fffd25eff15bf338ab8b12b971982eb0153 -SIZE (gst-plugins-good-1.24.8.tar.xz) = 2924936 +TIMESTAMP = 1730792873 +SHA256 (gst-plugins-base-1.24.9.tar.xz) = 5bb3b946907d3ce04dd842b610c8111c2b0611351b25a1fa22af5efa897857cb +SIZE (gst-plugins-base-1.24.9.tar.xz) = 2446392 +SHA256 (gst-plugins-bad-1.24.9.tar.xz) = 36fcf7a9af0a753b43bb03b9835246f74d72f7124369e66a1e2dc7b04f5a5cab +SIZE (gst-plugins-bad-1.24.9.tar.xz) = 7075040 +SHA256 (gst-plugins-ugly-1.24.9.tar.xz) = 4b6b30110f38cd05eb67422297142b75a55fe00003105f48b13603e6761cc3b6 +SIZE (gst-plugins-ugly-1.24.9.tar.xz) = 229116 +SHA256 (gst-plugins-good-1.24.9.tar.xz) = 897de50bff337e3ca2f86f1eaa28e0828d83024156162a50c4ea0af86e29799f +SIZE (gst-plugins-good-1.24.9.tar.xz) = 2929348 diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build index a579d1d275f3..07bce3438a08 100644 --- a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build @@ -1,22 +1,12 @@ ---- ext/gl/meson.build.orig 2024-08-21 11:25:15 UTC +--- ext/gl/meson.build.orig 2024-10-30 20:33:30 UTC +++ ext/gl/meson.build -@@ -114,10 +114,6 @@ endif - optional_deps += bcm_host_dep - endif +@@ -53,6 +53,9 @@ gl_objc_args = [] + optional_deps = [] + gl_objc_args = [] --if egl_dep.found() and cc.has_header('libdrm/drm_fourcc.h') -- optional_deps += allocators_dep --endif -- - if ['darwin', 'ios'].contains(host_system) - if not have_objc - error('No ObjC compiler found') -@@ -144,7 +140,7 @@ gstopengl = library('gstopengl', - objc_args : gst_plugins_base_args + gl_objc_args + extra_c_args, - link_args : noseh_link_args, - include_directories : [configinc], -- dependencies : [gstgl_dep, video_dep, -+ dependencies : [gstgl_dep, dependency('gstreamer-video-1.0'), - gst_base_dep, gst_controller_dep, libm] + optional_deps, - install : true, - install_dir : plugins_install_dir) ++allocators_dep = dependency('gstreamer-allocators-1.0') ++video_dep = dependency('gstreamer-video-1.0') ++ + if gl_dep.found() # have desktop GL + opengl_sources += [ + 'gstglfilterglass.c', diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build index a703339e63bf..03354619ad88 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build @@ -1,77 +1,21 @@ ---- gst-libs/gst/gl/meson.build.orig 2024-08-21 11:25:15 UTC +--- gst-libs/gst/gl/meson.build.orig 2024-10-30 20:33:30 UTC +++ gst-libs/gst/gl/meson.build -@@ -566,11 +566,6 @@ if need_platform_egl != 'no' - gl_platform_deps += egl_dep - glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1) +@@ -166,6 +166,9 @@ endif + error ('Found unfindable dependency') + endif -- if cc.has_header('libdrm/drm_fourcc.h') -- gl_misc_deps += allocators_dep -- glconf.set('GST_GL_HAVE_DMABUF', 1) -- endif -- - egl_includes = ''' - #include - #include -@@ -1103,7 +1098,7 @@ if build_gstgl - soversion : soversion, - darwin_versions : osxversion, - install : true, -- dependencies : [gst_base_dep, video_dep, allocators_dep, gmodule_dep, -+ dependencies : [gst_base_dep, dependency('gstreamer-video-1.0'), dependency('gstreamer-allocators-1.0'), gmodule_dep, - gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps], - # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems - implicit_include_directories : false) -@@ -1120,7 +1115,7 @@ if build_gstgl ++allocators_dep = dependency('gstreamer-allocators-1.0') ++video_dep = dependency('gstreamer-video-1.0') ++ + # OpenGL/GLES2 libraries + gl_lib_deps = [] + # GL platform - EGL, GLX, CGL, WGL, etc +@@ -1117,7 +1120,7 @@ if build_gstgl library_def = {'lib': gstgl} pkg_name = 'gstreamer-gl-1.0' pkgconfig.generate(gstgl, - libraries : [gstvideo, gst_base_dep, gst_dep], + libraries : [library('gstvideo-@0@'.format(api_version)), gst_base_dep, gst_dep], - variables : pkgconfig_variables + pkgconfig_gl_variables + pkgconfig_installed_variables, + variables : pkgconfig_variables + pkgconfig_gl_variables, uninstalled_variables : pkgconfig_gl_variables, subdirs : pkgconfig_subdirs, -@@ -1152,7 +1147,7 @@ if build_gstgl - 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], - 'install' : true, - 'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'], -- 'dependencies' : [video_dep, gst_dep, gst_base_dep], -+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep], - } - library_def += {'gir': [gir]} - if not static_build -@@ -1166,7 +1161,7 @@ if build_gstgl - gstgl_dep = declare_dependency(link_with : gstgl, - include_directories : [libsinc, compat_includes], - sources: gen_sources, -- dependencies : [video_dep, gst_base_dep, gl_winsys_deps], -+ dependencies : [dependency('gstreamer-video-1.0'), gst_base_dep, gl_winsys_deps], - variables: pkgconfig_gl_variables) - gstglproto_dep = declare_dependency( - dependencies : [gstgl_dep] + gl_lib_deps, -@@ -1197,7 +1192,7 @@ if build_gstgl - 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], - 'install' : true, - 'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'], -- 'dependencies' : [video_dep, gst_dep, gst_base_dep] -+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] - } - gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} - gst_libraries += [[pkg_name, {'gir': gir_dict}]] -@@ -1234,7 +1229,7 @@ if build_gstgl - 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], - 'install' : true, - 'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'], -- 'dependencies' : [video_dep, gst_dep, gst_base_dep] -+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] - } - - gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} -@@ -1271,7 +1266,7 @@ if build_gstgl - 'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'], - 'install' : true, - 'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'], -- 'dependencies' : [video_dep, gst_dep, gst_base_dep] -+ 'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep] - } - gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} - gst_libraries += [[pkg_name, {'gir': gir_dict}]] diff --git a/multimedia/gstreamer1-plugins/files/patch-tools_meson.build b/multimedia/gstreamer1-plugins/files/patch-tools_meson.build index 150234dd99db..dd92b3515cb9 100644 --- a/multimedia/gstreamer1-plugins/files/patch-tools_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-tools_meson.build @@ -1,13 +1,13 @@ ---- tools/meson.build.orig 2024-08-21 11:25:15 UTC +--- tools/meson.build.orig 2024-10-30 20:33:30 UTC +++ tools/meson.build @@ -1,3 +1,4 @@ +if not get_option('tools').disabled() tool_deps = [pbutils_dep, audio_dep, video_dep, tag_dep, gst_dep, gst_base_dep, gmodule_dep] extra_args = [] -@@ -44,7 +45,6 @@ endif - }, - } +@@ -44,7 +45,6 @@ gst_tools = { + }, + } -if not get_option('tools').disabled() and not static_build foreach tool, data: gst_tools diff --git a/multimedia/gstreamer1-rtsp-server/distinfo b/multimedia/gstreamer1-rtsp-server/distinfo index fcf94e02d354..211c3bfcf470 100644 --- a/multimedia/gstreamer1-rtsp-server/distinfo +++ b/multimedia/gstreamer1-rtsp-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726789451 -SHA256 (gst-rtsp-server-1.24.8.tar.xz) = 84ed2b34b8f581a418d8ab8eff7657635fcf83c8960f27065c6c47e52836ed02 -SIZE (gst-rtsp-server-1.24.8.tar.xz) = 283120 +TIMESTAMP = 1730792914 +SHA256 (gst-rtsp-server-1.24.9.tar.xz) = 299c9aafac3c91bbebe4cd481ed4e4ade8cb2b0677097bc4a8dcf6d4364c9804 +SIZE (gst-rtsp-server-1.24.9.tar.xz) = 285136 diff --git a/multimedia/gstreamer1-vaapi/distinfo b/multimedia/gstreamer1-vaapi/distinfo index 966fb5ebbcdb..4d15367422cb 100644 --- a/multimedia/gstreamer1-vaapi/distinfo +++ b/multimedia/gstreamer1-vaapi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726789477 -SHA256 (gstreamer-vaapi-1.24.8.tar.xz) = c8f015eee7a4d989383e0689a099bfabec95e55159ee875cc4eb9ff8d816dccb -SIZE (gstreamer-vaapi-1.24.8.tar.xz) = 553572 +TIMESTAMP = 1730792933 +SHA256 (gstreamer-vaapi-1.24.9.tar.xz) = c2373e9b4d6655535d355207f60084b0fb3b28566fe9bb4ca1da714439da4ae1 +SIZE (gstreamer-vaapi-1.24.9.tar.xz) = 554976 diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo index 13edfb319e7f..6ba0ad8bb814 100644 --- a/multimedia/gstreamer1/distinfo +++ b/multimedia/gstreamer1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726789379 -SHA256 (gstreamer-1.24.8.tar.xz) = b807dbf36c5d2b3ce1c604133ed0c737350f9523ce4d8d644a1177c5f9d6ded3 -SIZE (gstreamer-1.24.8.tar.xz) = 1861416 +TIMESTAMP = 1730792812 +SHA256 (gstreamer-1.24.9.tar.xz) = ebf47b6beef508a00c8557d4c1f1713e5c7ef9ba70dac45deed80e182bcf260f +SIZE (gstreamer-1.24.9.tar.xz) = 1863856 diff --git a/multimedia/py-gstreamer1/distinfo b/multimedia/py-gstreamer1/distinfo index 84ffe04cf645..46d8db8aedb3 100644 --- a/multimedia/py-gstreamer1/distinfo +++ b/multimedia/py-gstreamer1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727061342 -SHA256 (gst-python-1.24.8.tar.xz) = 0663d0d13f2692f573179c97b7c84e22600d14a2af757fc1740c7c4a3434c7fe -SIZE (gst-python-1.24.8.tar.xz) = 120324 +TIMESTAMP = 1730795072 +SHA256 (gst-python-1.24.9.tar.xz) = 80e61d587c34cbac79e46c927b71cf32c4bf9bb0868ce5aa4b7444bdad83f42e +SIZE (gst-python-1.24.9.tar.xz) = 122328