Commit 6253d5a6 authored by Andreas Beckmann's avatar Andreas Beckmann

refresh patches

parent 2c201844
......@@ -14,6 +14,7 @@ nvidia-settings (387.34-1) UNRELEASED; urgency=medium
- Fixed a bug that caused the nvidia-settings control panel to retain
some settings that had been applied, but not confirmed. This resulted
in unwanted settings being applied to subsequent settings changes.
* Refresh patches.
-- Andreas Beckmann <anbe@debian.org> Sun, 10 Dec 2017 06:05:00 +0100
......
......@@ -4,7 +4,7 @@ Bug-Debian: https://bugs.debian.org/666909
--- a/src/Makefile
+++ b/src/Makefile
@@ -106,6 +106,9 @@ endif
@@ -113,6 +113,9 @@ endif
XNVCTRL_DIR ?= libXNVCtrl
XNVCTRL_MAKEFILE ?= Makefile
XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
......@@ -14,7 +14,7 @@ Bug-Debian: https://bugs.debian.org/666909
XCONFIG_PARSER_DIR ?= XF86Config-parser
COMMON_UTILS_DIR ?= common-utils
COMMON_UNIX_DIR ?= common-unix
@@ -269,9 +272,9 @@ NVIDIA_SETTINGS_install: $(NVIDIA_SETTIN
@@ -286,9 +289,9 @@ NVIDIA_SETTINGS_install: $(NVIDIA_SETTIN
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
$(eval $(call DEBUG_INFO_RULES, $(NVIDIA_SETTINGS)))
......@@ -25,26 +25,26 @@ Bug-Debian: https://bugs.debian.org/666909
+ -rdynamic -o $@ $(OBJS) $(XNVCTRL_LIB) $(LIBS)
$(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
$(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(VERSION_MK)
@@ -279,7 +282,7 @@ $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XC
$(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
@@ -296,7 +299,7 @@ $(GTK2LIB).unstripped: $(GTK2_OBJS) $(XC
-o $@ \
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
$(GTK2_OBJS) $(XCP_OBJS) \
$(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS)
+ $(XNVCTRL_LIB) $(LIBS) $(GTK2_LIBS)
ifdef BUILD_GTK3LIB
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
@@ -288,7 +291,7 @@ $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XC
@@ -305,7 +308,7 @@ $(GTK3LIB).unstripped: $(GTK3_OBJS) $(XC
-o $@ \
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
$(GTK3_OBJS) $(XCP_OBJS) \
$(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS)
+ $(XNVCTRL_LIB) $(LIBS) $(GTK3_LIBS)
endif
# define the rule to build each object file
@@ -299,7 +302,7 @@ $(foreach src,$(XCP_SRC),$(eval $(call D
@@ -316,7 +319,7 @@ $(foreach src,$(XCP_SRC),$(eval $(call D
$(eval $(call DEFINE_STAMP_C_RULE, $(OBJS),$(NVIDIA_SETTINGS_PROGRAM_NAME)))
# define the rule to build $(XNVCTRL_ARCHIVE)
......
......@@ -24,28 +24,28 @@ Description: link libraries after object files
endif
else
GTK3_CFLAGS ?=
@@ -276,19 +276,19 @@ $(NVIDIA_SETTINGS).unstripped: $(OBJS) $
@@ -293,19 +293,19 @@ $(NVIDIA_SETTINGS).unstripped: $(OBJS) $
$(eval $(call DEBUG_INFO_RULES, $(GTK2LIB)))
$(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(VERSION_MK)
$(GTK2LIB).unstripped: $(GTK2_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS) \
- -Wl,--unresolved-symbols=ignore-all -o $@ \
+ -o $@ \
-Wl,-soname -Wl,$(GTK2LIB_SONAME) \
- $(GTK2_OBJS) $(XCP_OBJS)
+ $(GTK2_OBJS) $(XCP_OBJS) \
- $(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS)
+ $(GTK2_OBJS) $(IMAGE_OBJS) $(XCP_OBJS) \
+ $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK2_LIBS)
ifdef BUILD_GTK3LIB
$(eval $(call DEBUG_INFO_RULES, $(GTK3LIB)))
$(GTK3LIB).unstripped: $(GTK3_OBJS) $(XCP_OBJS) $(VERSION_MK)
$(GTK3LIB).unstripped: $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) $(VERSION_MK)
$(call quiet_cmd,LINK) -shared $(CFLAGS) $(LDFLAGS) $(BIN_LDFLAGS) \
- $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS) \
- -Wl,--unresolved-symbols=ignore-all -o $@ \
+ -o $@ \
-Wl,-soname -Wl,$(GTK3LIB_SONAME) \
- $(GTK3_OBJS) $(XCP_OBJS)
+ $(GTK3_OBJS) $(XCP_OBJS) \
- $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS)
+ $(GTK3_OBJS) $(XCP_OBJS) $(IMAGE_OBJS) \
+ $(XNVCTRL_ARCHIVE) $(LIBS) $(GTK3_LIBS)
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment