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.

Sign up for GitHub

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

[xwindow] part 6 #26858

Closed
wants to merge 15 commits into from
Closed

[xwindow] part 6 #26858

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
40f1f57
add libdrm
Neumann-A Sep 18, 2022
667b0d3
add libpciaccess
Neumann-A Sep 18, 2022
a3583f8
add libxshmfence
Neumann-A Sep 18, 2022
2828a3e
v db
Neumann-A Sep 18, 2022
41e5041
add newline
Neumann-A Sep 22, 2022
589da76
v db
Neumann-A Sep 22, 2022
40a1933
Actually build the ports once in CI
Neumann-A Oct 19, 2022
1f923be
make xorg macros build on osx
Neumann-A Oct 20, 2022
4801462
xproto also required for osx run
Neumann-A Oct 20, 2022
9e0ce34
Revert "Actually build the ports once in CI"
Neumann-A Oct 20, 2022
2f5f0c4
Revert "make xorg macros build on osx"
Neumann-A Oct 20, 2022
532037a
Revert "xproto also required for osx run"
Neumann-A Oct 20, 2022
5b8fca0
Merge remote-tracking branch 'upstream/master' into xwindow-part-6
Neumann-A Nov 14, 2022
5c8d205
v db
Neumann-A Nov 14, 2022
710d8fc
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Apr 21, 2023
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
28 changes: 28 additions & 0 deletions ports/libdrm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_DRM_LIBRARIES in your triplet")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
else()

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH
REPO mesa/drm
REF d76c387125c7ad336f39121b9c3148361731bdad #v2.4.108
SHA512 cefa58f0f04d96c3b9c4540ab94863c0781d46e7ef0e23a03b35d4e4033231a79f692eb601bbbba730f731a629336484df5d39c8dc0e4550e3db1634f4c2dbf2
HEAD_REF master # branch name
)

vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
)
vcpkg_install_meson()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
file(TOUCH "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") #No license in source?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could try to extract the copyright from the header files, I'll ask for opinions on the team

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could try to extract the copyright from the header files, I'll ask for opinions on the team

Seems like every file has a slightly different copyright owner but they seem to be all MIT.

endif()
11 changes: 11 additions & 0 deletions ports/libdrm/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "libdrm",
"version": "2.4.108",
"description": "Direct Rendering Manager library and headers",
"homepage": "https://gitlab.freedesktop.org/mesa/drm",
"license": null,
"dependencies": [
"libpciaccess",
"tool-meson"
]
}
35 changes: 35 additions & 0 deletions ports/libpciaccess/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
else()

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org/xorg
OUT_SOURCE_PATH SOURCE_PATH
REPO lib/libpciaccess
REF fbd1f0fe79ba25b72635f8e36a6c33d7e0ca19f6 #0.16
SHA512 e148e513453e4d6c131287d69910fa14b66557039acdfe3c59ec8de280841a62b9c727203331ebc2e9f0f1797dccbe22ca99aeecae78314448ef3cca017bc883
HEAD_REF master
)

set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")

vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
OPTIONS_DEBUG
--with-zlib=${CURRENT_INSTALLED_DIR}
OPTIONS_RELEASE
--with-zlib=${CURRENT_INSTALLED_DIR}/debug
)

vcpkg_install_make()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
endif()
12 changes: 12 additions & 0 deletions ports/libpciaccess/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "libpciaccess",
"version": "0.16",
"description": "Generic PCI access library",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libpciaccess",
"license": null,
"supports": "!(windows | osx)",
"dependencies": [
"xorg-macros",
"zlib"
]
}
32 changes: 32 additions & 0 deletions ports/libxshmfence/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
Neumann-A marked this conversation as resolved.
Show resolved Hide resolved
message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
else()

vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org/xorg
OUT_SOURCE_PATH SOURCE_PATH
REPO lib/libxshmfence
REF f38b2e73071ba516127f8f5ae47f48df58dc9d53 #1.3
SHA512 d3342db68b24b2b139977655fc42fde9b22cc1b786e1df6f14c5084e195d2208c11391b9a1769b4d6f9d41d21c163c1d9aa92f72059ada468375daaeee8dffdb
HEAD_REF master
)

set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")

vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
)

vcpkg_install_make()
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
endif()

14 changes: 14 additions & 0 deletions ports/libxshmfence/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "libxshmfence",
"version": "1.3",
"description": "Shared memory 'SyncFence' synchronization primitive",
"homepage": "https://gitlab.freedesktop.org/xorg/lib/libxshmfence",
"license": null,
"supports": "!windows",
"dependencies": [
"bzip2",
"pthread",
"xorg-macros",
"xproto"
]
}
12 changes: 12 additions & 0 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3668,6 +3668,10 @@
"baseline": "0.16.0",
"port-version": 0
},
"libdrm": {
"baseline": "2.4.108",
"port-version": 0
},
"libdshowcapture": {
"baseline": "0.6.0",
"port-version": 3
Expand Down Expand Up @@ -4064,6 +4068,10 @@
"baseline": "1.10.1",
"port-version": 1
},
"libpciaccess": {
"baseline": "0.16",
"port-version": 0
},
"libpff": {
"baseline": "2021-11-14",
"port-version": 0
Expand Down Expand Up @@ -4468,6 +4476,10 @@
"baseline": "1.2.3",
"port-version": 0
},
"libxshmfence": {
"baseline": "1.3",
"port-version": 0
},
"libxslt": {
"baseline": "1.1.37",
"port-version": 0
Expand Down
9 changes: 9 additions & 0 deletions versions/l-/libdrm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "30769c67778d28abf781c02760990363f29add84",
"version": "2.4.108",
"port-version": 0
}
]
}
9 changes: 9 additions & 0 deletions versions/l-/libpciaccess.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "75b10fd74aafa6a37761a37ea98d5bf453a41656",
"version": "0.16",
"port-version": 0
}
]
}
9 changes: 9 additions & 0 deletions versions/l-/libxshmfence.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "d7b7cacb13061a2afd277f3f84117394c8c04527",
"version": "1.3",
"port-version": 0
}
]
}