[packages/cgminer-gpu] Revert 2d087f10b500502e435b94492fabc622bef079f3.

arekm arekm at pld-linux.org
Sun Feb 23 13:03:55 CET 2014


commit 72c8a6b5813787a76812226b6b4e592e90c04ad9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Feb 23 12:56:21 2014 +0100

    Revert 2d087f10b500502e435b94492fabc622bef079f3.

 cgminer-build.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 cgminer.spec        | 16 ++++++++------
 2 files changed, 70 insertions(+), 6 deletions(-)
---
diff --git a/cgminer.spec b/cgminer.spec
index d858c6c..3d10a32 100644
--- a/cgminer.spec
+++ b/cgminer.spec
@@ -1,16 +1,19 @@
 %bcond_with	knc
-Summary:	FPGA/ASIC Miner by Con Kolivas
+Summary:	GPU/FPGA/ASIC Miner by Con Kolivas
 Name:		cgminer
-Version:	3.8.3
-Release:	2
+Version:	3.7.2
+Release:	1
 License:	GPL v2
 Group:		Applications/Networking
 URL:		http://forum.bitcoin.org/index.php?topic=28402.0
 Source0:	http://ck.kolivas.org/apps/cgminer/%{name}-%{version}.tar.bz2
 # Source0-md5:	ec70aee505fa3e8d9cbe566a65d420cb
-Patch0:		%{name}-system-jansson.patch
+Patch0:		%{name}-build.patch
+Patch1:		%{name}-system-jansson.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	Mesa-libOpenCL-devel
+BuildRequires:	amd-adl-sdk-devel
 BuildRequires:	curl-devel
 BuildRequires:	jansson-devel
 BuildRequires:	libusb-devel
@@ -67,9 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc API-README ASIC-README AUTHORS FPGA-README
-%doc NEWS README
+%doc API-README ASIC-README AUTHORS FPGA-README GPU-README
+%doc NEWS README SCRYPT-README
 %attr(755,root,root) %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/%{name}
 %{_libdir}/%{name}/bitstreams
+%{_libdir}/%{name}/*.cl
diff --git a/cgminer-build.patch b/cgminer-build.patch
new file mode 100644
index 0000000..dd13c89
--- /dev/null
+++ b/cgminer-build.patch
@@ -0,0 +1,60 @@
+--- cgminer-3.1.0/configure.ac.org	2013-04-30 13:02:59.103475727 +0200
++++ cgminer-3.1.0/configure.ac	2013-04-30 13:03:46.147989707 +0200
+@@ -188,10 +188,10 @@
+ if test "$found_opencl" = 1; then
+ 	if test "x$adl" != xno; then
+ 		ADL_CPPFLAGS=
+-		AC_CHECK_FILE([$srcdir/ADL_SDK/adl_sdk.h], [have_adl=true; ADL_CPPFLAGS=-I$srcdir], have_adl=false,)
+-		if test x$have_adl+$have_cgminer_sdk = xfalse+true; then
+-			AC_CHECK_FILE([$CGMINER_SDK/include/ADL_SDK/adl_sdk.h], [have_adl=true; ADL_CPPFLAGS=-I$CGMINER_SDK/include], have_adl=false,)
+-		fi
++		saved_CFLAGS="$CFLAGS"
++		CFLAGS="$CFLAGS -DLINUX=1"
++		AC_CHECK_HEADER(adl_sdk.h, [have_adl=true], [have_adl=false])
++		CFLAGS="$saved_CFLAGS"
+ 		if test x$have_adl = xtrue
+ 		then
+ 			AC_DEFINE([HAVE_ADL], [1], [Defined if ADL headers were found])
+diff -urN cgminer-3.1.0.org/adl.c cgminer-3.1.0/adl.c
+--- cgminer-3.1.0.org/adl.c	2013-03-07 06:38:09.000000000 +0100
++++ cgminer-3.1.0/adl.c	2013-04-30 13:08:26.741697503 +0200
+@@ -20,7 +20,7 @@
+ #endif
+ 
+ #include "miner.h"
+-#include "ADL_SDK/adl_sdk.h"
++#include "adl_sdk.h"
+ #include "compat.h"
+ 
+ #if defined (__linux)
+diff -urN cgminer-3.1.0.org/adl_functions.h cgminer-3.1.0/adl_functions.h
+--- cgminer-3.1.0.org/adl_functions.h	2012-08-21 13:21:55.000000000 +0200
++++ cgminer-3.1.0/adl_functions.h	2013-04-30 13:08:32.641845548 +0200
+@@ -38,7 +38,7 @@
+  #include <tchar.h>
+ #endif
+ 
+-#include "ADL_SDK/adl_sdk.h"
++#include "adl_sdk.h"
+ 
+ // Definitions of the used function pointers. Add more if you use other ADL APIs
+ 
+@@ -271,4 +271,4 @@
+ typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_GET ) (int iAdapterIndex, int* iPercentage, int* whatever);
+ typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_SET ) (int iAdapterIndex, int iPercentage);
+ //typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_CAPS ) (int iAdapterIndex, int* lpCaps, int* lpValid);
+-//typedef int ( *ADL_OVERDRIVE5_POWERCONTROLINFO_GET) (int iAdapterIndex, ...)
+\ Brak znaku nowej linii na końcu pliku
++//typedef int ( *ADL_OVERDRIVE5_POWERCONTROLINFO_GET) (int iAdapterIndex, ...)
+diff -urN cgminer-3.1.0.org/miner.h cgminer-3.1.0/miner.h
+--- cgminer-3.1.0.org/miner.h	2013-04-28 17:46:07.000000000 +0200
++++ cgminer-3.1.0/miner.h	2013-04-30 13:08:39.532018428 +0200
+@@ -103,7 +103,7 @@
+ 
+ 
+ #ifdef HAVE_ADL
+- #include "ADL_SDK/adl_sdk.h"
++ #include "adl_sdk.h"
+ #endif
+ 
+ #ifdef HAVE_LIBUSB
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cgminer-gpu.git/commitdiff/493ecb10011d4bc9381d6c7db33c474a02173a55



More information about the pld-cvs-commit mailing list