From f5e6a3bb0b4e90e4c6c56f6bb75bbd1f89961056 Mon Sep 17 00:00:00 2001 From: Andrew Tribick Date: Tue, 11 Feb 2025 03:20:53 +0000 Subject: [PATCH] [gstreamer] Update to 1.24.12 (#43690) --- ports/gstreamer/base-must-be-enabled.patch | 13 ------------- ports/gstreamer/plugins-base-x11.patch | 13 ------------- ports/gstreamer/portfile.cmake | 15 ++++----------- ports/gstreamer/remove_x264_define.patch | 18 ------------------ ports/gstreamer/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/gstreamer.json | 5 +++++ 7 files changed, 12 insertions(+), 59 deletions(-) delete mode 100644 ports/gstreamer/base-must-be-enabled.patch delete mode 100644 ports/gstreamer/plugins-base-x11.patch delete mode 100644 ports/gstreamer/remove_x264_define.patch diff --git a/ports/gstreamer/base-must-be-enabled.patch b/ports/gstreamer/base-must-be-enabled.patch deleted file mode 100644 index 5a4d3abeb3..0000000000 --- a/ports/gstreamer/base-must-be-enabled.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 6d07929..df015cb 100644 ---- a/meson.build -+++ b/meson.build -@@ -159,7 +159,7 @@ foreach sp : subprojects - subproj = subproject(project_name, required: is_required, default_options: default_options) - endif - -- if project_name == 'gst-plugins-base' -+ if project_name == 'gst-plugins-base' and subproj.found() - gst_base_orc_req = subproj.get_variable('orc_req', '') - if gst_base_orc_req != orc_req - error('orc_req is "@0@" but it should be "@1@" from subprojects/gst-plugins-base/meson.build' diff --git a/ports/gstreamer/plugins-base-x11.patch b/ports/gstreamer/plugins-base-x11.patch deleted file mode 100644 index f42551948c..0000000000 --- a/ports/gstreamer/plugins-base-x11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build -index 9b00253a0f..e3c3a0d920 100644 ---- a/subprojects/gst-plugins-base/meson.build -+++ b/subprojects/gst-plugins-base/meson.build -@@ -316,7 +316,7 @@ else - gtk_quartz_dep = dependency('', required : false) - endif - --core_conf.set('HAVE_X11', x11_dep.found()) -+core_conf.set('HAVE_X11', false) - core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) - - if gio_dep.type_name() == 'pkgconfig' diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 15e4439f03..cfb4d3655d 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -4,18 +4,12 @@ if(VCPKG_TARGET_IS_WINDOWS) ) endif() -vcpkg_download_distfile(PATCH_PR_7868_FIX_GSTX265ENC_C - URLS https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/ee3802cf71b386194e2a6318765e0547b37f52c8.diff - SHA512 3cd7395562a563f474ddb535d307e0a6aa30027a8c1cf5efea7560d989c28761eb9afa8dc89d7aee66364118c7ed1cef9a3766129bb830cc3ca6b8742b20fd4c - FILENAME gstreamer-gstreamer-1.25.1-ee3802cf71b386194e2a6318765e0547b37f52c8.patch -) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO gstreamer/gstreamer REF "${VERSION}" - SHA512 c181c8048ef859dfdd17d2bf1487d078704fdd289fed4e13fc00aebca055965c186286e60f3703c69d816734ef4be344b32650058d72517576927f9df18db2df + SHA512 5ca978cad5a661b081528be0fa74e199115c186afa1a0c9f55a9238fb2b452b680e75e8721a54077b9f4d717da5ef5801c359a0a89a5a02056caea067adab88f HEAD_REF main PATCHES fix-clang-cl.patch @@ -30,7 +24,6 @@ vcpkg_from_gitlab( no-downloads.patch ${PATCHES} fix-multiple-def.patch - "${PATCH_PR_7868_FIX_GSTX265ENC_C}" ) vcpkg_find_acquire_program(FLEX) @@ -210,7 +203,7 @@ vcpkg_configure_meson( -Dgst-plugins-good:pulse=auto -Dgst-plugins-good:qt5=disabled -Dgst-plugins-good:shout2=disabled - #-Dgst-plugins-good:soup=disabled + #-Dgst-plugins-good:soup=disabled -Dgst-plugins-good:twolame=disabled -Dgst-plugins-good:waveform=auto -Dgst-plugins-good:wavpack=disabled # Error during plugin build @@ -420,10 +413,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-gl-1.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-gl-1.0.pc" [[${libinc}]] "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gstreamer-gl-1.0.pc" [[-I${libdir}/gstreamer-1.0/include]] "") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-gl-1.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-gl-1.0.pc" [[${libinc}]] "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gstreamer-gl-1.0.pc" [[-I${libdir}/gstreamer-1.0/include]] "") endif() vcpkg_fixup_pkgconfig() diff --git a/ports/gstreamer/remove_x264_define.patch b/ports/gstreamer/remove_x264_define.patch deleted file mode 100644 index 044fb926bd..0000000000 --- a/ports/gstreamer/remove_x264_define.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h -index 6cbfc5c3d..ba7845b20 100644 ---- a/ext/x264/gstx264enc.h -+++ b/ext/x264/gstx264enc.h -@@ -31,13 +31,6 @@ - #include - #endif - --/* The x264.h header says this isn't needed with MinGW, but sometimes the -- * compiler is unable to correctly do the pointer indirection for us, which -- * leads to a segfault when you try to dereference any const values provided -- * by x264.dll. See: https://bugzilla.gnome.org/show_bug.cgi?id=779249 */ --#if defined(_WIN32) && !defined(X264_API_IMPORTS) --# define X264_API_IMPORTS --#endif - #include - - G_BEGIN_DECLS diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 0dfafb08df..9d5ff7c88f 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gstreamer", - "version": "1.24.7", - "port-version": 4, + "version": "1.24.12", "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 7f3267ae1e..677aa087c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3293,8 +3293,8 @@ "port-version": 2 }, "gstreamer": { - "baseline": "1.24.7", - "port-version": 4 + "baseline": "1.24.12", + "port-version": 0 }, "gtest": { "baseline": "1.16.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 63b5316851..1910c7d239 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6aeef9d1bd7507a0456624f0074842bee9c44b9", + "version": "1.24.12", + "port-version": 0 + }, { "git-tree": "169201c9dc33ce6f32f4d9299a54eae41f198d77", "version": "1.24.7",