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

linux-driver-management: Housekeeping #3569

Merged
merged 1 commit into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions packages/l/linux-driver-management/abi_libs
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
ldm-session-init
libldm.so.1
linux-driver-management
10 changes: 10 additions & 0 deletions packages/l/linux-driver-management/abi_symbols
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
ldm-session-init:ldm_device_attribute_get_type
ldm-session-init:ldm_device_type_get_type
ldm-session-init:ldm_gpu_type_get_type
ldm-session-init:ldm_manager_flags_get_type
ldm-session-init:ldm_pci_vendor_id_get_type
libldm.so.1:LIBLDM_0
libldm.so.1:ldm_bluetooth_device_get_type
libldm.so.1:ldm_device_attribute_get_type
Expand Down Expand Up @@ -68,3 +73,8 @@ libldm.so.1:ldm_provider_get_type
libldm.so.1:ldm_provider_new
libldm.so.1:ldm_usb_device_get_type
libldm.so.1:ldm_wifi_device_get_type
linux-driver-management:ldm_device_attribute_get_type
linux-driver-management:ldm_device_type_get_type
linux-driver-management:ldm_gpu_type_get_type
linux-driver-management:ldm_manager_flags_get_type
linux-driver-management:ldm_pci_vendor_id_get_type
12 changes: 6 additions & 6 deletions packages/l/linux-driver-management/abi_used_symbols
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
libc.so.6:__errno_location
libc.so.6:__fprintf_chk
libc.so.6:__getdelim
libc.so.6:__isoc23_sscanf
libc.so.6:__isoc23_strtoll
libc.so.6:__libc_start_main
libc.so.6:__stack_chk_fail
libc.so.6:access
Expand All @@ -14,12 +16,11 @@ libc.so.6:fwrite
libc.so.6:geteuid
libc.so.6:glob64
libc.so.6:globfree64
libc.so.6:sscanf
libc.so.6:stderr
libc.so.6:stdout
libc.so.6:strcmp
libc.so.6:strerror
libc.so.6:strlen
libc.so.6:strtoll
libc.so.6:unlink
libglib-2.0.so.0:g_assertion_message_expr
libglib-2.0.so.0:g_build_filename
Expand All @@ -45,9 +46,10 @@ libglib-2.0.so.0:g_io_channel_unix_new
libglib-2.0.so.0:g_io_channel_unref
libglib-2.0.so.0:g_list_free
libglib-2.0.so.0:g_log
libglib-2.0.so.0:g_malloc
libglib-2.0.so.0:g_mkdir_with_parents
libglib-2.0.so.0:g_once_init_enter
libglib-2.0.so.0:g_once_init_leave
libglib-2.0.so.0:g_once_init_enter_pointer
libglib-2.0.so.0:g_once_init_leave_pointer
libglib-2.0.so.0:g_option_context_add_main_entries
libglib-2.0.so.0:g_option_context_free
libglib-2.0.so.0:g_option_context_new
Expand Down Expand Up @@ -93,8 +95,6 @@ libgobject-2.0.so.0:g_param_spec_string
libgobject-2.0.so.0:g_signal_emit
libgobject-2.0.so.0:g_signal_new
libgobject-2.0.so.0:g_type_add_instance_private
libgobject-2.0.so.0:g_type_check_class_cast
libgobject-2.0.so.0:g_type_check_instance_cast
libgobject-2.0.so.0:g_type_class_adjust_private_offset
libgobject-2.0.so.0:g_type_class_peek_parent
libgobject-2.0.so.0:g_type_name
Expand Down
27 changes: 27 additions & 0 deletions packages/l/linux-driver-management/files/allow-newer-libusb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 035183d70fcd75ea3de659ac6350047b419eb600 Mon Sep 17 00:00:00 2001
From: Neal Gompa <[email protected]>
Date: Fri, 30 Mar 2018 09:36:19 -0400
Subject: [PATCH] Allow versions of libusb-1.0 newer than 1.0.21 to satisfy the
dependency

The libusb-1.0 dependency was set to exactly require 1.0.21, which
breaks the build when trying to build against 1.0.22.

Signed-off-by: Neal Gompa <[email protected]>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index b0c0a25..3b1982b 100644
--- a/meson.build
+++ b/meson.build
@@ -93,7 +93,7 @@ config_h = configure_file(
config_h_dir = include_directories('.')

# Required dependencies
-dep_usb = dependency('libusb-1.0', version: '1.0.21')
+dep_usb = dependency('libusb-1.0', version: '>= 1.0.21')

glib_min_version = '>= 2.54.0'
dep_glib2 = dependency('glib-2.0', version: glib_min_version)
6 changes: 6 additions & 0 deletions packages/l/linux-driver-management/monitoring.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
releases:
id: 16867
rss: https://github.com/getsolus/linux-driver-management/tags.atom
# No known CPE, checked 2024-08-13
security:
cpe: ~
30 changes: 17 additions & 13 deletions packages/l/linux-driver-management/package.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name : linux-driver-management

Check notice on line 1 in packages/l/linux-driver-management/package.yml

View workflow job for this annotation

GitHub Actions / Checks

This package is included in the ISO. Consider validating the functionality in a newly built ISO.
version : 1.0.3
release : 15
release : 16
source :
- https://github.com/solus-project/linux-driver-management/releases/download/v1.0.3/linux-driver-management-1.0.3.tar.xz : 968ef61fbb7e26b89ef9456f03cf31c616bdc8fc69531fcfd9f90ae0f4ff147b
license : LGPL-2.1
- https://github.com/getsolus/linux-driver-management/archive/refs/tags/v1.0.3.tar.gz : 6aa8455b9e77de0eccf1733fbd1f58bd8965903345e2239f0a4cac502821db9e
homepage : https://github.com/getsolus/linux-driver-management
license : LGPL-2.1-or-later
component :
- system.base
- gdm-integration : desktop.gnome
Expand All @@ -16,7 +17,6 @@
- sddm-integration : LDM Integration for SDDM
description: |
Linux Driver Management (LDM) provides the core functionality required for integration of drivers into modern Linux distributions. It provides centralised tooling for detection and configuration for drivers, with a specific focus currently on display drivers.
replaces : gl-driver-switch
builddeps :
- pkgconfig(check)
- pkgconfig(gio-unix-2.0)
Expand All @@ -27,6 +27,18 @@
- pkgconfig(umockdev-1.0)
- pkgconfig(xorg-server)
- vala
setup : |
%patch -p1 -i $pkgfiles/allow-newer-libusb.patch

%meson_configure -Dwith-gl-driver-switch-compat=true \
-Dwith-autostart-dir=/usr/share/xdg/autostart
build : |
%ninja_build
install : |
%ninja_install
# It looks like these have been failing for years: https://github.com/getsolus/linux-driver-management/issues/2
# check : |
# %ninja_check
patterns :
- gdm-integration :
- /usr/share/gdm/greeter/autostart/ldm-session-init.desktop
Expand All @@ -35,12 +47,4 @@
- /usr/share/lightdm/lightdm.conf.d/99-ldm.conf
- sddm-integration :
- /usr/share/sddm/scripts/Xsetup
setup : |
%meson_configure -Dwith-gl-driver-switch-compat=true \
-Dwith-autostart-dir=/usr/share/xdg/autostart
build : |
%ninja_build
install : |
%ninja_install
check : |
%ninja_check
replaces : gl-driver-switch
86 changes: 69 additions & 17 deletions packages/l/linux-driver-management/pspec_x86_64.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<PISI>
<Source>
<Name>linux-driver-management</Name>
<Homepage>https://github.com/getsolus/linux-driver-management</Homepage>
<Packager>
<Name>Ikey Doherty</Name>
<Email>[email protected]</Email>
<Name>Evan Maddock</Name>
<Email>[email protected]</Email>
</Packager>
<License>LGPL-2.1</License>
<License>LGPL-2.1-or-later</License>
<PartOf>system.base</PartOf>
<Summary xml:lang="en">Linux Driver Management</Summary>
<Description xml:lang="en">Linux Driver Management (LDM) provides the core functionality required for integration of drivers into modern Linux distributions. It provides centralised tooling for detection and configuration for drivers, with a specific focus currently on display drivers.
</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://sources.getsol.us/README.Solus</Archive>
</Source>
<Package>
<Name>linux-driver-management</Name>
Expand All @@ -19,11 +20,17 @@
</Description>
<PartOf>system.base</PartOf>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/bin/gl-driver-switch</Path>
<Path fileType="executable">/usr/bin/ldm-session-init</Path>
<Path fileType="executable">/usr/bin/linux-driver-management</Path>
<Path fileType="executable">/usr/bin/mkmodaliases</Path>
<Path fileType="library">/usr/lib64/girepository-1.0/Ldm-1.0.typelib</Path>
<Path fileType="library">/usr/lib64/lib*.so.*</Path>
<Path fileType="library">/usr/lib64/libldm.so.1</Path>
<Path fileType="library">/usr/lib64/libldm.so.1.0.2</Path>
<Path fileType="data">/usr/share/gir-1.0/Ldm-1.0.gir</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="man">/usr/share/man/man1/ldm-session-init.1</Path>
<Path fileType="man">/usr/share/man/man1/linux-driver-management.1</Path>
<Path fileType="man">/usr/share/man/man1/mkmodaliases.1</Path>
</Files>
<Replaces>
<Package>gl-driver-switch</Package>
Expand All @@ -36,13 +43,29 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
<Dependency release="15">linux-driver-management</Dependency>
<Dependency release="16">linux-driver-management</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
<Path fileType="library">/usr/lib64/lib*.so</Path>
<Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
<Path fileType="data">/usr/share/vala*/vapi/*</Path>
<Path fileType="header">/usr/include/linux-driver-management/bluetooth-device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/dmi-device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/glx-manager.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/gpu-config.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/hid-device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/ldm-enums.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/ldm.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/manager.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/modalias.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/pci-device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/plugin.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/plugins/modalias-plugin.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/provider.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/usb-device.h</Path>
<Path fileType="header">/usr/include/linux-driver-management/wifi-device.h</Path>
<Path fileType="library">/usr/lib64/libldm.so</Path>
<Path fileType="data">/usr/lib64/pkgconfig/ldm-1.0.pc</Path>
<Path fileType="data">/usr/share/vala/vapi/ldm-1.0.deps</Path>
<Path fileType="data">/usr/share/vala/vapi/ldm-1.0.vapi</Path>
</Files>
</Package>
<Package>
Expand All @@ -52,7 +75,36 @@
</Description>
<PartOf>programming.docs</PartOf>
<Files>
<Path fileType="doc">/usr/share/gtk-doc/html/</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmBluetoothDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmDMIDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmGLXManager.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmGPUConfig.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmHIDDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmManager.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmModalias.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmModaliasPlugin.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmPCIDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmPlugin.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmProvider.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/LdmUSBDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/annotation-glossary.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/api-index-full.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/devices.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/home.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/index.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/left-insensitive.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/left.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/linux-driver-management-LdmWifiDevice.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/linux-driver-management.devhelp2</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/linux-driver-management.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/object-tree.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/plugins.html</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/right-insensitive.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/right.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/style.css</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/up-insensitive.png</Path>
<Path fileType="doc">/usr/share/gtk-doc/html/linux-driver-management/up.png</Path>
</Files>
</Package>
<Package>
Expand Down Expand Up @@ -87,12 +139,12 @@
</Files>
</Package>
<History>
<Update release="15">
<Date>2018-02-10</Date>
<Update release="16">
<Date>2024-09-13</Date>
<Version>1.0.3</Version>
<Comment>Packaging update</Comment>
<Name>Ikey Doherty</Name>
<Email>[email protected]</Email>
<Name>Evan Maddock</Name>
<Email>[email protected]</Email>
</Update>
</History>
</PISI>