Skip to content
Snippets Groups Projects
Commit ac228b61 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

Merge updates from debian/bookworm-updates

parents a1f45fee 762541b5
No related branches found
No related tags found
3 merge requests!13Merge changes from apertis/v2024-updates into apertis/v2024,!10Backport v2024 <- v2025dev2: Update from debian/bookworm-updates,!9Update from debian/bookworm-updates for apertis/v2025dev2
Showing
with 365 additions and 445 deletions
nvidia-settings (525.147.05-1~deb12u1) bookworm; urgency=medium
* Rebuild for bookworm.
-- Andreas Beckmann <anbe@debian.org> Mon, 12 Feb 2024 00:39:29 +0100
nvidia-settings (525.147.05-1) unstable; urgency=medium
* New upstream release 525.147.05.
* Build for ppc64el.
-- Andreas Beckmann <anbe@debian.org> Fri, 26 Jan 2024 19:29:45 +0100
nvidia-settings (525.125.06-1~deb12u1) bookworm; urgency=medium
* Rebuild for bookworm.
-- Andreas Beckmann <anbe@debian.org> Wed, 12 Jul 2023 11:01:23 +0200
nvidia-settings (525.125.06-1) unstable; urgency=medium
* New upstream release 525.125.06.
* New upstream release 525.105.17.
- Fixed a bug that could cause the nvidia-settings control panel to
crash when resetting the display layout.
* Upload to unstable.
-- Andreas Beckmann <anbe@debian.org> Tue, 11 Jul 2023 23:27:45 +0200
nvidia-settings (525.85.05-2) experimental; urgency=medium
* Move source package back to contrib.
* libxnvctrl0, libxnvctrl-dev are now built by src:libxnvctrl.
* Upload to experimental.
-- Andreas Beckmann <anbe@debian.org> Tue, 18 Apr 2023 22:28:02 +0200
nvidia-settings (525.85.05-1+apertis0) apertis; urgency=medium
* Sync from debian/bookworm.
......
Source: nvidia-settings
Section: x11
Section: contrib/x11
Priority: optional
Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Uploaders:
......@@ -26,13 +26,11 @@ Vcs-Browser: https://salsa.debian.org/nvidia-team/nvidia-settings
Vcs-Git: https://salsa.debian.org/nvidia-team/nvidia-settings.git
Package: nvidia-settings
Section: contrib/x11
Architecture: amd64 arm64
Architecture: amd64 arm64 ppc64el
Pre-Depends:
nvidia-installer-cleanup,
Depends:
, ${nvidia}-alternative
, libxnvctrl0 (= ${binary:Version})
, ${shlibs:Depends}, ${misc:Depends}
Recommends:
, libgl1-${nvidia}-glvnd-glx
......@@ -50,32 +48,3 @@ Description: tool for configuring the NVIDIA graphics driver${nvidia:VariantDesc
.
Values such as brightness and gamma, XVideo attributes, temperature,
and OpenGL settings can be queried and configured via nvidia-settings.
Package: libxnvctrl0
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends}, ${misc:Depends}
Description: NV-CONTROL X extension (runtime library)
The NV-CONTROL X extension provides a mechanism for X clients to
query and set configuration parameters of the NVIDIA X driver.
State set by the NV-CONTROL X extension is assumed to be persistent
only for the current server generation.
.
This package contains the shared library.
Package: libxnvctrl-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libxnvctrl0 (= ${binary:Version}),
libx11-dev,
${misc:Depends}
Description: NV-CONTROL X extension (development files)
The NV-CONTROL X extension provides a mechanism for X clients to
query and set configuration parameters of the NVIDIA X driver.
State set by the NV-CONTROL X extension is assumed to be persistent
only for the current server generation.
......@@ -2,9 +2,15 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nvidia-settings
Upstream-Contact: NVIDIA Corporation
Source: https://download.nvidia.com/XFree86/nvidia-settings/
Disclaimer:
This package is not part of the GNU/Linux Debian distribution. It is
provided in the contrib archive area as a convenience to Debian users.
The contents of this source package are freely licensed under the Expat,
GPL, and other licenses, but it is only useful in combination with the
proprietary NVIDIA drivers in non-free.
Files: *
Copyright: (C) 2004-2021 NVIDIA Corporation
Copyright: (C) 2004-2023 NVIDIA Corporation
License: GPL-2
Files: samples/*
......@@ -96,7 +102,7 @@ License: Expat
Files: debian/*
Copyright: © 2004-2010 Randall Donald <rdonald@debian.org>
© 2009-2010 Fathi Boudra <fabo@debian.org>
© 2011-2023 Andreas Beckmann <anbe@debian.org>
© 2011-2024 Andreas Beckmann <anbe@debian.org>
© 2017 Luca Boccassi <bluca@debian.org>
License: GPL-2
......
doc/NV-CONTROL-API.txt
doc/FRAMELOCK.txt
samples/README
samples/Makefile
utils.mk
samples/*.c
src/libXNVCtrl/NVCtrl.h /usr/include/NVCtrl/
src/libXNVCtrl/NVCtrlLib.h /usr/include/NVCtrl/
src/libXNVCtrl/_out/debian/libXNVCtrl.a /usr/lib/${DEB_HOST_MULTIARCH}/
src/libXNVCtrl/_out/debian/libXNVCtrl.so /usr/lib/${DEB_HOST_MULTIARCH}/
src/libXNVCtrl/_out/debian/libXNVCtrl.so.* usr/lib/${DEB_HOST_MULTIARCH}/
libXNVCtrl.so.0 #PACKAGE# #MINVER#
* Build-Depends-Package: libxnvctrl-dev
#MISSING: 390.67# NV_ID@Base 337
XNVCTRLBindWarpPixmapName@Base 313
XNVCTRLIsNvScreen@Base 0
XNVCTRLQueryAttribute@Base 0
XNVCTRLQueryAttributePermissions@Base 0
XNVCTRLQueryBinaryData@Base 0
XNVCTRLQueryBinaryDataAttributePermissions@Base 0
XNVCTRLQueryExtension@Base 0
XNVCTRLQueryGvoColorConversion@Base 0
XNVCTRLQueryStringAttribute@Base 0
XNVCTRLQueryStringAttributePermissions@Base 0
XNVCTRLQueryStringOperationAttributePermissions@Base 0
XNVCTRLQueryTargetAttribute64@Base 0
XNVCTRLQueryTargetAttribute@Base 0
XNVCTRLQueryTargetBinaryData@Base 0
XNVCTRLQueryTargetCount@Base 0
XNVCTRLQueryTargetStringAttribute@Base 0
XNVCTRLQueryValidAttributeValues@Base 0
XNVCTRLQueryValidTargetAttributeValues@Base 0
XNVCTRLQueryValidTargetStringAttributeValues@Base 0
XNVCTRLQueryVersion@Base 0
XNVCTRLSetAttribute@Base 0
XNVCTRLSetAttributeAndGetStatus@Base 0
XNVCTRLSetGvoColorConversion@Base 0
XNVCTRLSetStringAttribute@Base 0
XNVCTRLSetTargetAttribute@Base 0
XNVCTRLSetTargetAttributeAndGetStatus@Base 0
XNVCTRLSetTargetStringAttribute@Base 0
XNVCTRLStringOperation@Base 0
XNVCtrlSelectNotify@Base 0
XNVCtrlSelectTargetNotify@Base 0
#MISSING: 390.67# pNV_ID@Base 337
[Desktop Entry]
Version=1.0
Type=Application
Exec=nvidia-settings
Terminal=false
Categories=HardwareSettings;System;Settings;
Icon=nvidia-settings#VARIANT#
Name=NVIDIA X Server Settings#VARIANT_DESC#
Comment=Configure NVIDIA X Server Settings#VARIANT_DESC#
# Translations provided by Sun Microsystems
Name[de]=NVIDIA X-Server-Einstellungen
Name[es]=Valores de configuración del servidor NVIDIA X
Name[fr]=Paramètres du serveur X NVIDIA
Name[it]=NVIDIA X Server Settings
Name[ja]=NVIDIA X サーバー設定
Name[ko]=NVIDIA X 서버 설정
Name[pt_BR]=Configurações do NVIDIA X Server
Name[zh_CN]=NVIDIA X 服务器设置
Name[zh_HK]=NVIDIA X 伺服器設定
Name[zh_TW]=NVIDIA X 伺服器設定
Comment[de]=Konfigurieren der NVIDIA X-Server-Einstellungen
Comment[es]=Establezca los valores de configuración del servidor NVIDIA X
Comment[fr]=Configurer les paramètres du serveur X NVIDIA
Comment[it]=Configura NVIDIA X Server Settings
Comment[ja]=NVIDIA X サーバー設定を構成します
Comment[ko]=NVIDIA X 서버 설정 구성
Comment[pt_BR]=Definir &configurações de gerenciamento de usuário...
Comment[zh_CN]=配置 NVIDIA X 服务器设置
Comment[zh_HK]=配置 NVIDIA X 伺服器設定
Comment[zh_TW]=配置 NVIDIA X 伺服器設定
../doc/nvidia-settings.desktop
\ No newline at end of file
Author: Andreas Beckmann <debian@abeckmann.de>
Description: build a shared library for libXNVCtrl
Bug-Debian: https://bugs.debian.org/666909
--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
@@ -50,8 +50,11 @@ LDFLAGS += $(XNVCTRL_LDFLAGS)
.PHONY: all
all: $(LIBXNVCTRL)
+all: $(LIBXNVCTRL_a)
+all: $(LIBXNVCTRL_so)
.PHONY: clean
clean:
rm -rf $(LIBXNVCTRL) *~ \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+ rm -f $(LIBXNVCTRL_a) $(LIBXNVCTRL_so) $(LIBXNVCTRL_so).*
--- a/src/libXNVCtrl/xnvctrl.mk
+++ b/src/libXNVCtrl/xnvctrl.mk
@@ -37,7 +37,9 @@ endif
XNVCTRL_CFLAGS ?=
-LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
+LIBXNVCTRL_a = $(OUTPUTDIR)/libXNVCtrl.a
+LIBXNVCTRL_so = $(OUTPUTDIR)/libXNVCtrl.so
+LIBXNVCTRL = $(LIBXNVCTRL_so)
LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
@@ -45,5 +47,11 @@ LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIS
$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
-$(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+$(LIBXNVCTRL_a) : $(LIBXNVCTRL_OBJ)
$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
+
+$(LIBXNVCTRL_so) : $(LIBXNVCTRL_OBJ)
+ $(RM) $@ $@.*
+ $(CC) -shared -Wl,-soname=$(@F).0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
+ ln -s $(@F).0.0.0 $@.0
+ ln -s $(@F).0 $@
......@@ -9,15 +9,17 @@ Forwarded: not-needed
+Version=1.0
Type=Application
-Encoding=UTF-8
+Exec=nvidia-settings
+Terminal=false
+Categories=HardwareSettings;System;Settings;
+Icon=nvidia-settings
Name=NVIDIA X Server Settings
Comment=Configure NVIDIA X Server Settings
-Name=NVIDIA X Server Settings
-Comment=Configure NVIDIA X Server Settings
-Exec=__UTILS_PATH__/nvidia-settings
-Icon=__PIXMAP_PATH__/nvidia-settings.png
-Categories=__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__
+Exec=nvidia-settings
+Terminal=false
+Categories=HardwareSettings;System;Settings;
+Icon=nvidia-settings#VARIANT#
+Name=NVIDIA X Server Settings#VARIANT_DESC#
+Comment=Configure NVIDIA X Server Settings#VARIANT_DESC#
# Translation by Marcin Mikołajczak
Name[pl]=Ustawienia serwera X NVIDIA
link-order.diff
10_libxnvctrl_so_0.diff
12_nvidia-settings.desktop.diff
typos.diff
kfreebsd-hurd.diff
......
......@@ -31,12 +31,25 @@ include debian/rules.defs
NVIDIA_LEGACY ?=
NVIDIA_TESLA ?=
NVIDIA_RELEASE = $(DEB_VERSION_UPSTREAM)
variant = $(if $(NVIDIA_TESLA),tesla-$(NVIDIA_TESLA),$(if $(NVIDIA_LEGACY),legacy-$(NVIDIA_LEGACY)xx))
variant_description = $(if $(NVIDIA_TESLA), (Tesla $(NVIDIA_TESLA) version),$(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version)))
empty =
variant =
variant_description =
ifneq (,$(NVIDIA_LEGACY))
variant = legacy-$(NVIDIA_LEGACY)xx))
variant_description = $(empty) ($(NVIDIA_LEGACY)xx legacy version)))
endif
ifneq (,$(NVIDIA_TESLA))
variant = tesla-$(NVIDIA_TESLA)
variant_description = $(empty) (Tesla $(NVIDIA_TESLA) version)
endif
ifeq (yes,$(NVIDIA_TESLA))
variant = tesla
variant_description = $(empty) (Tesla version)
endif
-variant = $(if $(variant),-$(variant))
nvidia = nvidia$(-variant)
nvidia_private = nvidia/$(if $(variant),$(variant),current)
watch_version ?= $(or $(NVIDIA_TESLA),$(NVIDIA_LEGACY))
watch_version ?= $(or $(filter-out yes,$(NVIDIA_TESLA)),$(NVIDIA_LEGACY))
ALL_CONTROL := $(wildcard debian/nvidia-settings.*)
VARIANT_CONTROL := $(wildcard debian/nvidia-settings$(-variant).*)
......@@ -53,14 +66,7 @@ AUTOCLEAN = $(filter-out $(AUTOKEEP),$(AUTOGEN))
%:
dh $@
ifeq (,$(filter nvidia-settings,$(shell dh_listpackages)))
override_dh_auto_build: $(AUTOGEN)
CC_ONLY_CFLAGS="$(CPPFLAGS)" dh_auto_build --sourcedirectory=src/libXNVCtrl
override_dh_auto_install:
else
override_dh_auto_build: $(AUTOGEN)
CC_ONLY_CFLAGS="$(CPPFLAGS)" dh_auto_build --sourcedirectory=src/libXNVCtrl
CC_ONLY_CFLAGS="$(CPPFLAGS)" dh_auto_build -O--parallel
$(MAKE) -C samples
......@@ -69,7 +75,6 @@ override_dh_auto_install:
install -m 0755 samples/$(OUTPUTDIR)/nv-control-dpy debian/tmp/usr/bin/
install -d -m 0755 debian/tmp/usr/share/icons/hicolor/128x128/apps/
install -m 0644 doc/nvidia-settings.png debian/tmp/usr/share/icons/hicolor/128x128/apps/nvidia-settings$(-variant).png
endif
override_dh_auto_clean:
dh_auto_clean -- BUILD_GTK3LIB=1
......
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
variables:
SALSA_CI_COMPONENTS: 'main contrib non-free'
SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1
NVIDIA_VERSION = 525.85.05
NVIDIA_VERSION = 525.147.05
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
......
NVIDIA_VERSION = 525.85.05
NVIDIA_VERSION = 525.147.05
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
......
......@@ -1292,7 +1292,7 @@ static nvDisplayPtr setup_display(CtkMMDialog *ctk_mmdialog)
void update_mosaic_dialog_ui(CtkMMDialog *ctk_mmdialog, nvLayoutPtr layout)
{
nvModeLineItemPtr iter;
char *id;
char *id = NULL;
if (ctk_mmdialog == NULL) {
return;
......@@ -1300,6 +1300,7 @@ void update_mosaic_dialog_ui(CtkMMDialog *ctk_mmdialog, nvLayoutPtr layout)
if (layout) {
ctk_mmdialog->layout = layout;
ctk_mmdialog->cur_modeline = NULL;
}
parse_slimm_layout(ctk_mmdialog,
......@@ -1307,12 +1308,14 @@ void update_mosaic_dialog_ui(CtkMMDialog *ctk_mmdialog, nvLayoutPtr layout)
&ctk_mmdialog->h_overlap_parsed,
&ctk_mmdialog->v_overlap_parsed);
id = g_strdup(ctk_mmdialog->cur_modeline->data.identifier);
if (ctk_mmdialog->cur_modeline) {
id = g_strdup(ctk_mmdialog->cur_modeline->data.identifier);
}
setup_display(ctk_mmdialog);
iter = ctk_mmdialog->modelines;
while (iter->next) {
while (id && iter->next) {
if (strcmp(id, iter->modeline->data.identifier) == 0) {
ctk_mmdialog->cur_modeline = iter->modeline;
break;
......
NVIDIA_VERSION = 525.85.05
NVIDIA_VERSION = 525.147.05
# This file.
VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment