Compare commits

..

1 Commits
c8 ... i9ce

Author SHA1 Message Date
Arkady L. Shane f51559360f
import libXNVCtrl-435.17-6.el9
11 months ago

2
.gitignore vendored

@ -1 +1 @@
SOURCES/nvidia-settings-352.21.tar.bz2 SOURCES/nvidia-settings-435.17.tar.bz2

@ -1 +1 @@
0c2d91e0fe941d7ff638bc55fb816528199e1241 SOURCES/nvidia-settings-352.21.tar.bz2 27ecd1c9d2ebad90bc73145d2ae68c03e98c1545 SOURCES/nvidia-settings-435.17.tar.bz2

@ -1,67 +1,39 @@
--- a/src/Makefile diff -up nvidia-settings-435.17/src/libXNVCtrl/Makefile.shared nvidia-settings-435.17/src/libXNVCtrl/Makefile
+++ b/src/Makefile --- nvidia-settings-435.17/src/libXNVCtrl/Makefile.shared 2019-08-07 06:12:32.000000000 +0200
@@ -106,6 +106,9 @@ +++ nvidia-settings-435.17/src/libXNVCtrl/Makefile 2019-08-26 16:23:41.921778088 +0200
@@ -50,8 +50,9 @@ LDFLAGS += $(XNVCTRL_LDFLAGS)
.PHONY: clean
-all: $(LIBXNVCTRL)
+all: $(LIBXNVCTRL) libXNVCtrl.so
clean:
rm -rf $(LIBXNVCTRL) *~ \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+ rm -f libXNVCtrl.so libXNVCtrl.so.*
diff -up nvidia-settings-435.17/src/Makefile.shared nvidia-settings-435.17/src/Makefile
--- nvidia-settings-435.17/src/Makefile.shared 2019-08-07 06:12:31.000000000 +0200
+++ nvidia-settings-435.17/src/Makefile 2019-08-26 16:17:31.133406921 +0200
@@ -106,6 +106,9 @@ endif
XNVCTRL_DIR ?= libXNVCtrl XNVCTRL_DIR ?= libXNVCtrl
XNVCTRL_MAKEFILE ?= Makefile XCONFIG_PARSER_DIR ?= XF86Config-parser
XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a COMMON_UTILS_DIR ?= common-utils
+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0 +XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE) +#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE)
+XNVCTRL_LIB ?= $(XNVCTRL_SHARED) +XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
XCONFIG_PARSER_DIR ?= XF86Config-parser
COMMON_UTILS_DIR ?= common-utils
COMMON_UNIX_DIR ?= common-unix COMMON_UNIX_DIR ?= common-unix
@@ -280,14 +283,17 @@ VIRTUAL_RESOLUTIONS_DIR ?= $(COMMON_UNIX_DIR)/virtual-resolutions
$(MKDIR) $(BINDIR)
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE) diff -up nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk.shared nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk
+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED): --- nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk.shared 2019-08-07 06:12:32.000000000 +0200
+ $(MAKE) -C $(XNVCTRL_DIR) +++ nvidia-settings-435.17/src/libXNVCtrl/xnvctrl.mk 2019-08-26 16:54:44.518016474 +0200
+ @@ -47,3 +47,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,
+$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_LIB)
$(call quiet_cmd,LINK) $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- -rdynamic -o $@ $(OBJS) $(XNVCTRL_ARCHIVE) $(LIBS)
+ -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
$(call quiet_cmd,STRIP_CMD) $@
$(GTK2LIB): $(GTK2_OBJS) $(XCP_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
+ $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS) \
-Wl,--unresolved-symbols=ignore-all -o $(GTK2LIB) \
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
$(GTK2_OBJS) $(XCP_OBJS)
@@ -296,7 +302,7 @@
ifdef BUILD_GTK3LIB
$(GTK3LIB): $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
+ $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS) \
-Wl,--unresolved-symbols=ignore-all -o $(GTK3LIB) \
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
$(GTK3_OBJS) $(XCP_OBJS)
--- a/src/libXNVCtrl/Makefile
+++ b/src/libXNVCtrl/Makefile
@@ -55,10 +55,17 @@
.PHONY: clean
all: $(LIBXNVCTRL) $(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
+all: libXNVCtrl.so $(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
+
$(LIBXNVCTRL) : $(OBJS) +libXNVCtrl.so: $(LIBXNVCTRL_OBJ)
$(AR) ru $@ $(OBJS)
+libXNVCtrl.so: $(OBJS)
+ $(RM) $@ $@.*
+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11 + $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
+ ln -s $@.0.0.0 $@.0 + ln -s $@.0.0.0 $@.0
+ ln -s $@.0 $@ + ln -s $@.0 $@
+
# define the rule to build each object file
$(foreach src,$(SRC),$(eval $(call DEFINE_OBJECT_RULE,TARGET,$(src))))
@@ -68,3 +75,4 @@
clean:
rm -rf $(LIBXNVCTRL) *~ $(STAMP_C) \
$(OUTPUTDIR)/*.o $(OUTPUTDIR)/*.d
+ rm -f libXNVCtrl.so libXNVCtrl.so.*

@ -1,12 +1,11 @@
Name: libXNVCtrl Name: libXNVCtrl
Version: 352.21 Version: 435.17
Release: 9%{?dist} Release: 6%{?dist}
Summary: Library providing the NV-CONTROL API Summary: Library providing the NV-CONTROL API
License: GPLv2+ License: GPLv2+
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/ URL: https://download.nvidia.com/XFree86/nvidia-settings/
Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{version}.tar.bz2 Source0: %{url}/nvidia-settings-%{version}.tar.bz2
Patch0: libxnvctrl_so_0.patch Patch0: libxnvctrl_so_0.patch
Patch1: libxnvctrl_optflags.patch
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
@ -14,6 +13,10 @@ BuildRequires: libX11-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
BuildRequires: hostname BuildRequires: hostname
# Obsoletes older package provided in the NVIDIA CUDA repository
Obsoletes: nvidia-%{name} < 3:%{version}-100
Provides: nvidia-%{name} = 3:%{version}-100
%description %description
This packages contains the libXNVCtrl library from the nvidia-settings This packages contains the libXNVCtrl library from the nvidia-settings
application. This library provides the NV-CONTROL API for communicating with application. This library provides the NV-CONTROL API for communicating with
@ -24,9 +27,8 @@ themselves.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libX11-devel Requires: libX11-devel%{?_isa}
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -34,18 +36,18 @@ developing applications that use %{name}.
%prep %prep
%setup -q -n nvidia-settings-%{version} %autosetup -p1 -n nvidia-settings-%{version}
%patch0 -p1
%patch1 -p1
%build %build
make %{?_smp_mflags} \ %{set_build_flags}
CC="gcc" \ %make_build \
CC="%{__cc}" \
NV_VERBOSE=1 \ NV_VERBOSE=1 \
OPTFLAGS="%{optflags}" \ DO_STRIP=0 \
LDFLAGS="%{build_ldflags}" \ STRIP_CMD=/dev/true \
-C src/%{name} -C src/%{name} \
libXNVCtrl.so
%install %install
@ -65,7 +67,7 @@ popd
%files %files
%doc COPYING %license COPYING
%{_libdir}/%{name}.so.0* %{_libdir}/%{name}.so.0*
%files devel %files devel
@ -75,6 +77,38 @@ popd
%changelog %changelog
* Fri Feb 09 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 435.17-6
- Rebuilt for MSVSphere 9.3
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 435.17-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Tom Stellard <tstellar@redhat.com> - 435.17-2
- Replace hard-coded gcc with __cc macro
* Mon Aug 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 435.17-1
- Update to 435.17
- Obsoletes older nvidia-libXNVCtrl from cuda repo
- Switch URL to https
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 352.21-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 352.21-9 * Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 352.21-9
- Use ldconfig scriptlet macros - Use ldconfig scriptlet macros

Loading…
Cancel
Save