Merge pull request #86233 from prusnak/remove-amd-legacy
amdadl-sdk, amdapp-sdk: remove
This commit is contained in:
Jaka Hudoklin
GitHub
commit
d3ef0655d4
@ -1,50 +0,0 @@
|
||||
{ requireFile, stdenv, unzip }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "6.0";
|
||||
pname = "amdadl-sdk";
|
||||
|
||||
src = requireFile {
|
||||
name = "ADL_SDK_6.0.zip";
|
||||
url = "http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/";
|
||||
sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
unpackPhase = ''
|
||||
unzip $src
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
#Build adlutil
|
||||
cd adlutil
|
||||
gcc main.c -o adlutil -DLINUX -ldl -I ../include/
|
||||
cd ..
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
#Install SDK
|
||||
mkdir -p $out/bin
|
||||
cp -r include "$out/"
|
||||
cp "adlutil/adlutil" "$out/bin/adlutil"
|
||||
|
||||
#Fix modes
|
||||
chmod -R 755 "$out/bin/"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "API to access display driver functionality for ATI graphics cards";
|
||||
homepage = "https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/";
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
--- samples/Makefile 2012-11-29 05:58:48.000000000 +0100
|
||||
+++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100
|
||||
@@ -3,7 +3,6 @@
|
||||
include $(DEPTH)/make/openclsdkdefs.mk
|
||||
|
||||
SUBDIRS = opencl
|
||||
-SUBDIRS += aparapi
|
||||
ifneq ($(OS), lnx)
|
||||
SUBDIRS += C++Amp
|
||||
ifeq ($(BITS), 64)
|
||||
@ -1,108 +0,0 @@
|
||||
{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg,
|
||||
version? "2.8", # What version
|
||||
samples? false # Should samples be installed
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
bits = if stdenv.hostPlatform.system == "x86_64-linux" then "64"
|
||||
else "32";
|
||||
|
||||
arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64"
|
||||
else "x86";
|
||||
|
||||
src_info = {
|
||||
"2.6" = {
|
||||
url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz";
|
||||
x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm";
|
||||
x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih";
|
||||
};
|
||||
|
||||
"2.7" = {
|
||||
url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz";
|
||||
x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b";
|
||||
x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1";
|
||||
patches = [ ./gcc-5.patch];
|
||||
};
|
||||
|
||||
"2.8" = {
|
||||
url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz";
|
||||
x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356";
|
||||
x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681";
|
||||
|
||||
# TODO: Add support for aparapi, java parallel api
|
||||
patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch];
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
pname = "amdapp-sdk";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = stdenv.lib.getAttrFromPath [version "url"] src_info;
|
||||
sha256 = stdenv.lib.getAttrFromPath [version arch] src_info;
|
||||
};
|
||||
|
||||
patches = stdenv.lib.attrByPath [version "patches"] [] src_info;
|
||||
|
||||
patchFlags = [ "-p0" ];
|
||||
buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ];
|
||||
propagatedBuildInputs = [ stdenv.cc ];
|
||||
NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm";
|
||||
doCheck = false;
|
||||
|
||||
unpackPhase = ''
|
||||
tar xvzf $src
|
||||
tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz
|
||||
cd AMD-APP-SDK-v${version}-*-lnx${bits}
|
||||
'';
|
||||
|
||||
buildPhase = if !samples then ''echo "nothing to build"'' else null;
|
||||
|
||||
installPhase = ''
|
||||
# Install SDK
|
||||
mkdir -p $out
|
||||
cp -r {docs,include} "$out/"
|
||||
mkdir -p "$out/"{bin,lib,samples/opencl/bin}
|
||||
cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo"
|
||||
cp -r "./lib/${arch}/"* "$out/lib/"
|
||||
|
||||
# Register ICD
|
||||
mkdir -p "$out/etc/OpenCL/vendors"
|
||||
echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd"
|
||||
# The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt
|
||||
|
||||
# Install includes
|
||||
mkdir -p "$out/usr/include/"{CAL,OpenVideo}
|
||||
install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/"
|
||||
|
||||
${ if samples then ''
|
||||
# Install samples
|
||||
find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \;
|
||||
cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin"
|
||||
for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*");
|
||||
do
|
||||
wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin"
|
||||
done'' else ""
|
||||
}
|
||||
|
||||
# Create wrappers
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo
|
||||
patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo
|
||||
|
||||
# Fix modes
|
||||
find "$out/" -type f -exec chmod 644 {} \;
|
||||
chmod -R 755 "$out/bin/"
|
||||
find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \;
|
||||
find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \;
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support";
|
||||
homepage = "https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/";
|
||||
license = licenses.amd;
|
||||
maintainers = [ maintainers.offline ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
--- include/CL/cl.hpp
|
||||
+++ include/CL/cl.hpp
|
||||
@@ -201,7 +201,7 @@
|
||||
#include <functional>
|
||||
#define __CL_FUNCTION_TYPE typename std::function
|
||||
#define CL_USE_CPP_FUNCTORS
|
||||
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
|
||||
+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX)
|
||||
#include <tr1/functional>
|
||||
#define __CL_FUNCTION_TYPE typename std::tr1::function
|
||||
#define CL_USE_CPP_FUNCTORS
|
||||
@ -9671,26 +9671,6 @@ in
|
||||
|
||||
### DEVELOPMENT / MISC
|
||||
|
||||
amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
|
||||
|
||||
amdappsdk26 = amdappsdk.override {
|
||||
version = "2.6";
|
||||
};
|
||||
|
||||
amdappsdk27 = amdappsdk.override {
|
||||
version = "2.7";
|
||||
};
|
||||
|
||||
amdappsdk28 = amdappsdk.override {
|
||||
version = "2.8";
|
||||
};
|
||||
|
||||
amdappsdk = callPackage ../development/misc/amdapp-sdk { };
|
||||
|
||||
amdappsdkFull = amdappsdk.override {
|
||||
samples = true;
|
||||
};
|
||||
|
||||
h3 = callPackage ../development/misc/h3 { };
|
||||
|
||||
amtk = callPackage ../development/libraries/amtk { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user