parent
2372a43c7b
commit
de03317916
@ -1 +1 @@
|
||||
SOURCES/nvidia-settings-352.21.tar.bz2
|
||||
SOURCES/nvidia-settings-565.57.01.tar.bz2
|
||||
|
@ -1 +1 @@
|
||||
0c2d91e0fe941d7ff638bc55fb816528199e1241 SOURCES/nvidia-settings-352.21.tar.bz2
|
||||
23bdaf37eef78d0752250f6b79574cc00df3a6d8 SOURCES/nvidia-settings-565.57.01.tar.bz2
|
||||
|
@ -1,22 +0,0 @@
|
||||
--- a/src/libXNVCtrl/Makefile.orig 2015-01-16 15:29:38.678963363 +0100
|
||||
+++ b/src/libXNVCtrl/Makefile 2015-01-16 15:32:50.571028309 +0100
|
||||
@@ -38,7 +38,7 @@
|
||||
LIBXNVCTRL_VERSION := $(NVIDIA_VERSION)
|
||||
|
||||
CFLAGS += -I .
|
||||
-CFLAGS += -fPIC
|
||||
+CFLAGS += -fPIC $(OPTFLAGS)
|
||||
CFLAGS += -I $(OUTPUTDIR)
|
||||
CFLAGS += -DPROGRAM_NAME=\"$(LIBXNVCTRL_PROGRAM_NAME)\"
|
||||
|
||||
--- a/src/libXNVCtrl/utils.mk.orig 2015-01-16 15:29:43.918964321 +0100
|
||||
+++ b/src/libXNVCtrl/utils.mk 2015-01-16 15:32:23.298020384 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
# only set these warnings and optimizations if CFLAGS is unset
|
||||
CFLAGS ?= -Wall -O2
|
||||
# always set these -f CFLAGS
|
||||
-CFLAGS += -fno-strict-aliasing -fno-omit-frame-pointer -Wformat=2
|
||||
+CFLAGS += $(OPTFLAGS)
|
||||
CC_ONLY_CFLAGS ?=
|
||||
LDFLAGS ?=
|
||||
BIN_LDFLAGS ?=
|
@ -1,67 +1,25 @@
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -106,6 +106,9 @@
|
||||
XNVCTRL_DIR ?= libXNVCtrl
|
||||
XNVCTRL_MAKEFILE ?= Makefile
|
||||
XNVCTRL_ARCHIVE ?= $(XNVCTRL_DIR)/libXNVCtrl.a
|
||||
+XNVCTRL_SHARED ?= $(XNVCTRL_DIR)/libXNVCtrl.so.0
|
||||
+#XNVCTRL_LIB ?= $(XNVCTRL_ARCHIVE)
|
||||
+XNVCTRL_LIB ?= $(XNVCTRL_SHARED)
|
||||
XCONFIG_PARSER_DIR ?= XF86Config-parser
|
||||
COMMON_UTILS_DIR ?= common-utils
|
||||
COMMON_UNIX_DIR ?= common-unix
|
||||
@@ -280,14 +283,17 @@
|
||||
$(MKDIR) $(BINDIR)
|
||||
$(INSTALL) $(INSTALL_BIN_ARGS) $< $(BINDIR)/$(notdir $<)
|
||||
diff --git a/src/libXNVCtrl/xnvctrl.mk b/src/libXNVCtrl/xnvctrl.mk
|
||||
index e6be2ef..c0921c4 100644
|
||||
--- a/src/libXNVCtrl/xnvctrl.mk
|
||||
+++ b/src/libXNVCtrl/xnvctrl.mk
|
||||
@@ -39,6 +39,11 @@ XNVCTRL_CFLAGS ?=
|
||||
|
||||
-$(NVIDIA_SETTINGS): $(OBJS) $(XNVCTRL_ARCHIVE)
|
||||
+$(XNVCTRL_ARCHIVE) $(XNVCTRL_SHARED):
|
||||
+ $(MAKE) -C $(XNVCTRL_DIR)
|
||||
+
|
||||
+$(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
|
||||
LIBXNVCTRL = $(OUTPUTDIR)/libXNVCtrl.a
|
||||
|
||||
all: $(LIBXNVCTRL)
|
||||
+all: libXNVCtrl.so
|
||||
+LIBXNVCTRL_SHARED = $(OUTPUTDIR)/libXNVCtrl.so
|
||||
+LIBXNVCTRL_ABI_VERSION_MAJOR = 0
|
||||
+LIBXNVCTRL_ABI_VERSION_MINOR = 0
|
||||
+LIBXNVCTRL_LIBS += -lXext -lX11
|
||||
+
|
||||
LIBXNVCTRL_SRC = $(XNVCTRL_DIR)/NVCtrl.c
|
||||
|
||||
$(LIBXNVCTRL) : $(OBJS)
|
||||
$(AR) ru $@ $(OBJS)
|
||||
LIBXNVCTRL_OBJ = $(call BUILD_OBJECT_LIST,$(LIBXNVCTRL_SRC))
|
||||
@@ -47,3 +52,8 @@ $(eval $(call DEFINE_OBJECT_RULE,TARGET,$(LIBXNVCTRL_SRC)))
|
||||
|
||||
+libXNVCtrl.so: $(OBJS)
|
||||
+ $(RM) $@ $@.*
|
||||
+ $(CC) -shared -Wl,-soname=$@.0 -o $@.0.0.0 $(LDFLAGS) $^ -lXext -lX11
|
||||
+ ln -s $@.0.0.0 $@.0
|
||||
+ ln -s $@.0 $@
|
||||
$(LIBXNVCTRL) : $(LIBXNVCTRL_OBJ)
|
||||
$(call quiet_cmd,AR) ru $@ $(LIBXNVCTRL_OBJ)
|
||||
+
|
||||
# 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.*
|
||||
+libXNVCtrl.so : $(LIBXNVCTRL_OBJ)
|
||||
+ $(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname=$(notdir $@).${LIBXNVCTRL_ABI_VERSION_MAJOR} -o $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $^ $(LIBXNVCTRL_LIBS)
|
||||
+ ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@
|
||||
+ ln -s $(notdir $@).$(LIBXNVCTRL_ABI_VERSION_MAJOR).$(LIBXNVCTRL_ABI_VERSION_MINOR).0 $@.$(LIBXNVCTRL_ABI_VERSION_MAJOR)
|
||||
|
Loading…
Reference in new issue