Author: glen Date: Sun May 6 14:33:28 2012 GMT
Module: packages Tag: NVIDIA_173
---- Log message:
- restore xlibs patch for this branch
---- Files affected:
packages/nvidia-settings:
nvidia-settings-xlibs.patch (1.4 -> 1.4.2.1) , nvidia-settings.spec
(1.21.2.2 -> 1.21.2.3)
---- Diffs:
================================================================
Index: packages/nvidia-settings/nvidia-settings-xlibs.patch
diff -u packages/nvidia-settings/nvidia-settings-xlibs.patch:1.4
packages/nvidia-settings/nvidia-settings-xlibs.patch:1.4.2.1
--- packages/nvidia-settings/nvidia-settings-xlibs.patch:1.4 Mon Jun 14
15:03:58 2010
+++ packages/nvidia-settings/nvidia-settings-xlibs.patch Sun May 6
16:33:23 2012
@@ -15,7 +15,7 @@
@@ -146,6 +146,7 @@
ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11_CFLAGS) $(GTK_CFLAGS)
$(INC_FLAGS)
- ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS)
+ ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11_LIBS) -lm
+ALL_LIBS = $(GTK_LIBS) $(X11_LIBS)
CPPFLAGS = $(ALL_CFLAGS)
================================================================
Index: packages/nvidia-settings/nvidia-settings.spec
diff -u packages/nvidia-settings/nvidia-settings.spec:1.21.2.2
packages/nvidia-settings/nvidia-settings.spec:1.21.2.3
--- packages/nvidia-settings/nvidia-settings.spec:1.21.2.2 Sun May 6
16:28:58 2012
+++ packages/nvidia-settings/nvidia-settings.spec Sun May 6 16:33:23 2012
@@ -16,6 +16,7 @@
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: prev_error_handler.patch
+Patch1: nvidia-settings-xlibs.patch
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
BuildRequires: OpenGL-devel
BuildRequires: xorg-lib-libX11-devel
@@ -80,6 +81,7 @@
%prep
%setup -q -n %{name}-1.0
%patch0 -p1
+%patch1 -p1
%{__rm} src/libXNVCtrl/libXNVCtrl.a
@@ -149,6 +151,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21.2.3 2012/05/06 14:33:23 glen
+- restore xlibs patch for this branch
+
Revision 1.21.2.2 2012/05/06 14:28:58 glen
- fix compile error: ‘prev_error_handler’ undeclared (first use in this
function
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/nvidia-settings/nvidia-settings-xlibs.patch?r1=1.4&r2=1.4.2.1
http://cvs.pld-linux.org/packages/nvidia-settings/nvidia-settings.spec?r1=1.21.2.2&r2=1.21.2.3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
