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][gst-rtsp-server] Support Linux, fix OSX build and fix pkgconfig #20814

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f257db9
[gstreamer] Support Linux and fix pkgconfig
Oct 18, 2021
e270e38
version
Oct 18, 2021
78fab4f
remove baseline record
Oct 18, 2021
e2c32fd
Fix installation
Oct 18, 2021
139ca90
version
Oct 18, 2021
ad39d0c
[gst-rtsp-server] Fix linux build
Oct 18, 2021
0aa25dc
version
Oct 18, 2021
ff58908
Add qtmultimedia:x64-linux to fail
Oct 18, 2021
c10f745
Test osx build
Oct 18, 2021
fc67192
Revert test code
Oct 18, 2021
374ef59
Revert test code
Oct 18, 2021
7c5d13c
version
Oct 18, 2021
9dadd27
Revert test code
Oct 18, 2021
26360c4
version
Oct 18, 2021
5154fd2
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Feb 7, 2022
319a91d
version
Feb 7, 2022
b136daf
[gstreamer] build with 1.19.3 (#4)
luncliff Mar 3, 2022
65ed040
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Mar 3, 2022
3af53d7
Merge branch 'dev/jack/20785' of https://github.com/JackBoosY/vcpkg i…
Mar 3, 2022
ade3e07
[gstreamer] fix feature option 'flac' (#5)
luncliff Mar 17, 2022
409e70f
Apply suggestion
Mar 18, 2022
a7f1258
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Mar 18, 2022
1199e8f
version
Mar 18, 2022
4ac30ab
Merge branch 'master' into dev/jack/20785
JackBoosY Apr 8, 2022
7c79a98
Add supports and dependency features
Apr 13, 2022
9036bef
version
Apr 13, 2022
329c336
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/…
Apr 13, 2022
84a16c5
Merge branch 'dev/jack/20785' of https://github.com/JackBoosY/vcpkg i…
Apr 13, 2022
61e795b
Correct the dependencies according to the platform
Apr 13, 2022
6caae4e
version
Apr 13, 2022
f85e524
Add supports, add license
Apr 13, 2022
e9fcd5b
version
Apr 13, 2022
10f388e
Try to avoid trigger gstreamer[plugins-bad]:x64-osx
Apr 13, 2022
1c3fa6b
Update dependencies
Apr 13, 2022
29863b4
Restore some changes
Apr 13, 2022
b38f27c
format manifest
Apr 13, 2022
2c41b52
version
Apr 13, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions ports/gst-rtsp-server/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,45 @@ vcpkg_configure_meson(

vcpkg_install_meson()

vcpkg_copy_pdbs()

# For pkgconfig
if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*.pc")
if (GST_EXT_PKGS)
foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS)
file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT)
string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}")
file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}")
file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
endforeach()
endif()
endif()

if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(GLOB_RECURSE GST_EXT_PKGS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*.pc")
if (GST_EXT_PKGS)
foreach(GST_EXT_PKG IN LISTS GST_EXT_PKGS)
file(READ "${GST_EXT_PKG}" GST_EXT_PKG_CONTENT)
string(REPLACE [[libdir=${prefix}/lib]] [[libdir=${prefix}/lib/gstreamer-1.0]] GST_EXT_PKG_CONTENT "${GST_EXT_PKG_CONTENT}")
file(WRITE "${GST_EXT_PKG}" "${GST_EXT_PKG_CONTENT}")
file(COPY "${GST_EXT_PKG}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
endforeach()
endif()
endif()

vcpkg_fixup_pkgconfig()

if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll
${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb
file(GLOB DBG_BINS "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll"
"${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb"
)
file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll
${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb
file(COPY ${DBG_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
file(GLOB REL_BINS "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll"
"${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb"
)
file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(COPY ${REL_BINS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE ${DBG_BINS} ${REL_BINS})
endif()

vcpkg_fixup_pkgconfig()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
16 changes: 14 additions & 2 deletions ports/gst-rtsp-server/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
{
"name": "gst-rtsp-server",
"version": "1.19.2",
"port-version": 1,
"port-version": 2,
"description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server",
"homepage": "https://gstreamer.freedesktop.org",
"license": "GPL-2.0-or-later",
"supports": "!osx",
"dependencies": [
"gstreamer",
{
"name": "gstreamer",
"default-features": false,
"features": [
"plugins-bad",
"plugins-base",
"plugins-good",
"plugins-ugly"
]
},
{
"name": "vcpkg-tool-meson",
"host": true
Expand Down
19 changes: 19 additions & 0 deletions ports/gstreamer/fix-package-search.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/subprojects/gst-plugins-good/ext/lame/meson.build b/subprojects/gst-plugins-good/ext/lame/meson.build
index 2169fde..4a33f6e 100644
--- a/subprojects/gst-plugins-good/ext/lame/meson.build
+++ b/subprojects/gst-plugins-good/ext/lame/meson.build
@@ -1,9 +1,13 @@
lame_option = get_option('lame')

lame_extra_c_args = []
-lame_dep = cc.find_library('mp3lame', required: false)
have_lame = cc.has_header_symbol('lame/lame.h', 'lame_init')
if have_lame
+ if host_system == 'windows' # vcpkg port 'mp3lame'
+ lame_dep = cc.find_library('libmp3lame', required: true)
+ else
+ lame_dep = cc.find_library('mp3lame', required: true)
+ endif
if cc.has_header_symbol('lame/lame.h', 'lame_set_VBR_quality')
lame_extra_c_args += ['-DHAVE_LAME_SET_VBR_QUALITY']
endif
13 changes: 0 additions & 13 deletions ports/gstreamer/plugins-base-use-zlib.patch

This file was deleted.

13 changes: 0 additions & 13 deletions ports/gstreamer/plugins-good-use-zlib.patch

This file was deleted.

Loading