Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gstreamer] Update to version 1.20.4 and rework #27790

Merged
merged 11 commits into from
Nov 28, 2022
22 changes: 15 additions & 7 deletions ports/gst-rtsp-server/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH
REPO gstreamer/gst-rtsp-server
REF 1.19.2
SHA512 a227471c790ea4f399748233128558cbd43e941ad9774b99ecd88c1b521a0adfe2932212e7d854f041892a7c3bfc63a1b3ea9dd06d2f0b75b7eee38e392d8c51
REPO gstreamer/gstreamer
REF 1.20.4
SHA512 bd2e3812f719c530027513f1ac6715e093c4fb3c56553e4ad82506dfc5fd81616777ee08489723809faee693e68f010abf716cc23c82a7d17490b6942ce5cac4
HEAD_REF master
)

set(SOURCE_PATH "${SOURCE_PATH}/subprojects/gst-rtsp-server")

vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-Dgstreamer:examples=disabled
-Dgstreamer:tests=disabled
-Dexamples=disabled
-Dtests=disabled
-Dintrospection=disabled
-Dpackage-origin="vcpkg"
OPTIONS_RELEASE
-Dgobject-cast-checks=disabled
-Dglib-asserts=disabled
-Dglib-checks=disabled
)

vcpkg_install_meson()
Expand All @@ -38,6 +45,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/"
"${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/")
endif()

vcpkg_fixup_pkgconfig()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
14 changes: 11 additions & 3 deletions ports/gst-rtsp-server/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
{
"name": "gst-rtsp-server",
"version": "1.19.2",
"port-version": 2,
"version": "1.20.4",
"description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server",
"homepage": "https://gstreamer.freedesktop.org/",
"license": "LGPL-2.1-only",
"dependencies": [
"gstreamer",
"glib",
{
"name": "gstreamer",
"default-features": false,
"features": [
"plugins-base"
]
},
{
"name": "vcpkg-tool-meson",
"host": true
Expand Down
48 changes: 24 additions & 24 deletions ports/gstreamer/fix-clang-cl-bad.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/ext/dts/meson.build b/ext/dts/meson.build
diff --git a/subprojects/gst-plugins-bad/ext/dts/meson.build b/subprojects/gst-plugins-bad/ext/dts/meson.build
index 8ab3fc917..c19aa2264 100644
--- a/ext/dts/meson.build
+++ b/ext/dts/meson.build
--- a/subprojects/gst-plugins-bad/ext/dts/meson.build
+++ b/subprojects/gst-plugins-bad/ext/dts/meson.build
@@ -15,7 +15,7 @@ if not dca_dep.found()
endif

Expand All @@ -11,10 +11,10 @@ index 8ab3fc917..c19aa2264 100644
# autotools didn't use the libdca pkg-config cflags, and they
# can point to a non-existing location (/usr/include/dca)
no_warn_c_args = ['-Wno-missing-include-dirs']
diff --git a/gst-libs/gst/d3d11/meson.build b/gst-libs/gst/d3d11/meson.build
diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
index 4a844ef75..cd97e8f7a 100644
--- a/gst-libs/gst/d3d11/meson.build
+++ b/gst-libs/gst/d3d11/meson.build
--- a/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/d3d11/meson.build
@@ -174,7 +174,7 @@ endif

# MinGW 32bits compiler seems to be complaining about redundant-decls
Expand All @@ -24,10 +24,10 @@ index 4a844ef75..cd97e8f7a 100644
extra_args = cc.get_supported_arguments([
'-Wno-redundant-decls',
])
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build
index 7cab556e0..35531110b 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gst-plugins-bad/meson.build
+++ b/subprojects/gst-plugins-bad/meson.build
@@ -45,7 +45,7 @@ endif

cdata = configuration_data()
Expand All @@ -37,10 +37,10 @@ index 7cab556e0..35531110b 100644
msvc_args = [
# Ignore several spurious warnings for things gstreamer does very commonly
# If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
diff --git a/sys/asio/meson.build b/sys/asio/meson.build
diff --git a/subprojects/gst-plugins-bad/sys/asio/meson.build b/subprojects/gst-plugins-bad/sys/asio/meson.build
index 3006d26ce..1afbd0022 100644
--- a/sys/asio/meson.build
+++ b/sys/asio/meson.build
--- a/subprojects/gst-plugins-bad/sys/asio/meson.build
+++ b/subprojects/gst-plugins-bad/sys/asio/meson.build
@@ -15,7 +15,7 @@ endif

# FIXME: non-msvc is not tested, and unlikely supported yet because of
Expand All @@ -50,10 +50,10 @@ index 3006d26ce..1afbd0022 100644
if asio_option.enabled()
error('asio plugin can only be built with MSVC')
else
diff --git a/sys/d3d11/meson.build b/sys/d3d11/meson.build
diff --git a/subprojects/gst-plugins-bad/sys/d3d11/meson.build b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
index 43f213d9c..9c9e9b535 100644
--- a/sys/d3d11/meson.build
+++ b/sys/d3d11/meson.build
--- a/subprojects/gst-plugins-bad/sys/d3d11/meson.build
+++ b/subprojects/gst-plugins-bad/sys/d3d11/meson.build
@@ -102,7 +102,7 @@ endif

# MinGW 32bits compiler seems to be complaining about redundant-decls
Expand All @@ -63,10 +63,10 @@ index 43f213d9c..9c9e9b535 100644
extra_mingw_args = cc.get_supported_arguments([
'-Wno-redundant-decls',
])
diff --git a/sys/decklink/meson.build b/sys/decklink/meson.build
diff --git a/subprojects/gst-plugins-bad/sys/decklink/meson.build b/subprojects/gst-plugins-bad/sys/decklink/meson.build
index d869e79a4..c7b37a7c6 100644
--- a/sys/decklink/meson.build
+++ b/sys/decklink/meson.build
--- a/subprojects/gst-plugins-bad/sys/decklink/meson.build
+++ b/subprojects/gst-plugins-bad/sys/decklink/meson.build
@@ -18,7 +18,7 @@ decklink_libs = []

if host_system == 'windows'
Expand All @@ -76,10 +76,10 @@ index d869e79a4..c7b37a7c6 100644
# FIXME: Use commsuppwd.lib for debug builds?
comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink'))
if comutil_dep.found()
diff --git a/sys/mediafoundation/meson.build b/sys/mediafoundation/meson.build
diff --git a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
index 828954909..af570f9ff 100644
--- a/sys/mediafoundation/meson.build
+++ b/sys/mediafoundation/meson.build
--- a/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
+++ b/subprojects/gst-plugins-bad/sys/mediafoundation/meson.build
@@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled()
subdir_done()
endif
Expand All @@ -89,10 +89,10 @@ index 828954909..af570f9ff 100644
if mf_option.enabled()
error('mediafoundation plugin can only be built with MSVC')
endif
diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build
diff --git a/subprojects/gst-plugins-bad/sys/msdk/meson.build b/subprojects/gst-plugins-bad/sys/msdk/meson.build
index a77160049..7c834d8ed 100644
--- a/sys/msdk/meson.build
+++ b/sys/msdk/meson.build
--- a/subprojects/gst-plugins-bad/sys/msdk/meson.build
+++ b/subprojects/gst-plugins-bad/sys/msdk/meson.build
@@ -139,13 +139,13 @@ if have_mfx_ver134
endif

Expand Down
6 changes: 3 additions & 3 deletions ports/gstreamer/fix-clang-cl-base.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index 495671ebb..fff3ea518 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gst-plugins-base/meson.build
+++ b/subprojects/gst-plugins-base/meson.build
@@ -43,7 +43,7 @@ plugins = []

cc = meson.get_compiler('c')
Expand Down
6 changes: 3 additions & 3 deletions ports/gstreamer/fix-clang-cl-good.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 64705379f..0c55b9732 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gst-plugins-good/meson.build
+++ b/subprojects/gst-plugins-good/meson.build
@@ -30,7 +30,7 @@ plugins = []
cc = meson.get_compiler('c')
host_system = host_machine.system()
Expand Down
14 changes: 7 additions & 7 deletions ports/gstreamer/fix-clang-cl-gstreamer.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
diff --git a/gst/parse/meson.build b/gst/parse/meson.build
diff --git a/subprojects/gstreamer/gst/parse/meson.build b/subprojects/gstreamer/gst/parse/meson.build
index 35ed6f2f4..5e38e49ea 100644
--- a/gst/parse/meson.build
+++ b/gst/parse/meson.build
--- a/subprojects/gstreamer/gst/parse/meson.build
+++ b/subprojects/gstreamer/gst/parse/meson.build
@@ -16,7 +16,7 @@ else
endif

flex_cdata.set('FLEX', flex.path())
flex_cdata.set('FLEX', flex.full_path())
-if cc.get_id() == 'msvc'
+if cc.get_argument_syntax() == 'msvc'
flex_cdata.set('FLEX_ARGS', '--nounistd')
else
flex_cdata.set('FLEX_ARGS', '')
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
index 772809e15..70b1eafc5 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -36,7 +36,7 @@ cc = meson.get_compiler('c')

cdata = configuration_data()
Expand Down
6 changes: 3 additions & 3 deletions ports/gstreamer/fix-clang-cl-ugly.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build
index 14be48c4c..83d019874 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gst-plugins-ugly/meson.build
+++ b/subprojects/gst-plugins-ugly/meson.build
@@ -31,7 +31,7 @@ if have_cxx
cxx = meson.get_compiler('cpp')
endif
Expand Down
2 changes: 1 addition & 1 deletion ports/gstreamer/fix-clang-cl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ index 1316366ed..daeaf3cb1 100644
+ elif cc.get_argument_syntax() == 'msvc'
warning('FIXME: Provide a def file to publish the public symbols')
else
error('Failed to link with version script (' + symbol_map + '), check logs for details')
warning('FIXME: Linker does not support the supplied version script (' + symbol_map + '), please disable the "gst-full-version-script" option')
34 changes: 0 additions & 34 deletions ports/gstreamer/gstreamer-disable-hot-doc.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/gstreamer/gstreamer-disable-no-unused.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
index bed8c4e..772809e 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -435,8 +435,8 @@ if cc.has_header('execinfo.h')
endif
endif
Expand Down
6 changes: 3 additions & 3 deletions ports/gstreamer/plugin-base-disable-no-unused.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index 9b00253..495671e 100644
--- a/meson.build
+++ b/meson.build
--- a/subprojects/gst-plugins-base/meson.build
+++ b/subprojects/gst-plugins-base/meson.build
@@ -388,10 +388,11 @@ int32x4_t testfunc(int16_t *a, int16_t *b) {
endif
endif
Expand Down
13 changes: 0 additions & 13 deletions ports/gstreamer/plugins-base-use-zlib.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/gstreamer/plugins-base-x11.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/meson.build b/meson.build
diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index 9b00253a0f..e3c3a0d920 100644
--- a/meson.build
+++ b/meson.build
--- 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
Expand Down
13 changes: 0 additions & 13 deletions ports/gstreamer/plugins-good-use-zlib.patch

This file was deleted.

16 changes: 0 additions & 16 deletions ports/gstreamer/plugins-ugly-disable-doc.patch

This file was deleted.

Loading