- up to 3.8.3; GPU mining dropped upstream

diff --git a/cgminer-build.patch b/cgminer-build.patch
deleted file mode 100644 (file)
index dd13c89..0000000
--- a/cgminer-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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>\r
- #endif\r
- \r
--#include "ADL_SDK/adl_sdk.h"\r
-+#include "adl_sdk.h"\r
- \r
- // Definitions of the used function pointers. Add more if you use other ADL APIs\r
- \r
-@@ -271,4 +271,4 @@
- typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_GET ) (int iAdapterIndex, int* iPercentage, int* whatever);\r
- typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_SET ) (int iAdapterIndex, int iPercentage);\r
- //typedef int ( *ADL_OVERDRIVE5_POWERCONTROL_CAPS ) (int iAdapterIndex, int* lpCaps, int* lpValid);\r
--//typedef int ( *ADL_OVERDRIVE5_POWERCONTROLINFO_GET) (int iAdapterIndex, ...)
-\ Brak znaku nowej linii na końcu pliku
-+//typedef int ( *ADL_OVERDRIVE5_POWERCONTROLINFO_GET) (int iAdapterIndex, ...)\r
-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

diff --git a/cgminer.spec b/cgminer.spec
index 9142070cbb4c8b9ba40248226d951e51cddffbab..1b2fe9eb0dbebced2d8760bbd816d54847d3313c 100644 (file)
--- a/cgminer.spec
+++ b/cgminer.spec
@@ -1,16 +1,13 @@
 # TODO -devel subpackage
-Summary:       GPU/FPGA/ASIC Miner by Con Kolivas
+Summary:       FPGA/ASIC Miner by Con Kolivas
 Name:          cgminer
-Version:       3.7.2
+Version:       3.8.3
 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: 82739bb98dca12786592792d9a44979c
-Patch0:                %{name}-build.patch
-BuildRequires: Mesa-libOpenCL-devel
-BuildRequires: amd-adl-sdk-devel
+# Source0-md5: ec70aee505fa3e8d9cbe566a65d420cb
 BuildRequires: curl-devel
 BuildRequires: libusb-devel
 BuildRequires: ncurses-devel
@@ -24,7 +21,6 @@ This is a miner for Bitcoin.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal}
@@ -64,12 +60,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc API-README ASIC-README AUTHORS FPGA-README GPU-README
-%doc NEWS README SCRYPT-README
+%doc API-README ASIC-README AUTHORS FPGA-README
+%doc NEWS README
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_libdir}/libjansson.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libjansson.so.4
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/%{name}
 %{_libdir}/%{name}/bitstreams
-%{_libdir}/%{name}/*.cl