From 6cf6e63cf2e14d574e79d4018cb1885af33f4baf Mon Sep 17 00:00:00 2001 From: Lukas Rucka Date: Fri, 15 Dec 2017 16:33:52 +0100 Subject: [PATCH] Packaging: Update build policy for various distributions --- package_specs/ultragrid-nightly/debian-clang.patch | 11 +++++++++++ .../ultragrid-nightly/debian-patches-clang.series | 1 + .../ultragrid-nightly-Debian_90.dsc.tpl | 11 +++++++++++ .../ultragrid-nightly/ultragrid-nightly.spec.tpl | 10 +++++----- package_specs/ultragrid/_service.tpl | 2 +- package_specs/ultragrid/ultragrid.spec.tpl | 11 ++++++----- 6 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 package_specs/ultragrid-nightly/debian-clang.patch create mode 100644 package_specs/ultragrid-nightly/debian-patches-clang.series create mode 100644 package_specs/ultragrid-nightly/ultragrid-nightly-Debian_90.dsc.tpl diff --git a/package_specs/ultragrid-nightly/debian-clang.patch b/package_specs/ultragrid-nightly/debian-clang.patch new file mode 100644 index 000000000..db044fb65 --- /dev/null +++ b/package_specs/ultragrid-nightly/debian-clang.patch @@ -0,0 +1,11 @@ +--- a/debian/rules 2017-11-09 11:06:30.000000000 +0100 ++++ b/debian/rules 2017-11-22 15:56:23.854956499 +0100 +@@ -49,7 +49,7 @@ CARDCONF_AJA= --enable-aja --with-aja=/u + ##################################################### + # > cuda + ##################################################### +-CUDA=--with-cuda=/usr/local/cuda-8.0 --enable-jpeg ++CUDA=--with-cuda=/usr/local/cuda-8.0 --enable-jpeg --with-cuda-host-compiler=clang + ##################################################### + # < cuda + ##################################################### diff --git a/package_specs/ultragrid-nightly/debian-patches-clang.series b/package_specs/ultragrid-nightly/debian-patches-clang.series new file mode 100644 index 000000000..30b0a4988 --- /dev/null +++ b/package_specs/ultragrid-nightly/debian-patches-clang.series @@ -0,0 +1 @@ +debian-clang.patch diff --git a/package_specs/ultragrid-nightly/ultragrid-nightly-Debian_90.dsc.tpl b/package_specs/ultragrid-nightly/ultragrid-nightly-Debian_90.dsc.tpl new file mode 100644 index 000000000..65c9b276b --- /dev/null +++ b/package_specs/ultragrid-nightly/ultragrid-nightly-Debian_90.dsc.tpl @@ -0,0 +1,11 @@ +# see https://en.opensuse.org/openSUSE:Build_Service_Debian_builds#packageName.dsc +DEBTRANSFORM-TAR: ultragrid-nightly-1.4.tar.bz2 +DEBTRANSFORM-FILES-TAR: debian.tar.gz +DEBTRANSFORM-SERIES: debian-patches-clang.series +Format: 1.0 +Source: ultragrid-nightly +Binary: ultragrid-nightly +Architecture: any +Version: 1.4-2017091100 +Maintainer: Lukas Rucka +Build-Depends: debhelper (>= 8.0), build-essential, make, autoconf, automake, autotools-dev, libmagickwand-dev, libjpeg-dev, freeglut3-dev, libglew1.6-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev, libsdl1.2-dev, libqt4-dev, libqtgui4, qt4-dev-tools, libxxf86vm1, libx11-6, libxdamage1, portaudio19-dev, libjack-dev, libasound2-dev, libv4l-dev, zip, libavcodec-dev, liblivemedia-dev, libopencv-dev, libssl-dev, libgpujpeg-dev, libcairo2-dev, ultragrid-proprietary-drivers-nightly, libglib2.0-dev, libcurl4-openssl-dev, git, nvidia-cuda-toolkit (>= 5.0), clang, qtbase5-dev diff --git a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl index 96873ead5..d9dd25399 100644 --- a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl +++ b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl @@ -41,12 +41,12 @@ BuildRequires: glib2-devel, libcurl-devel ##################################################### %if 0%{?cuda} > 0 -%if 0%{?fedora} > 1 && 0%{?fedora} < 21 -BuildRequires: cuda-core-6-5,cuda-command-line-tools-6-5,cuda-cudart-dev-6-5 -%define cudaconf --with-cuda=/usr/local/cuda-6.5 +%if 0%{?fedora} > 1 && 0%{?fedora} < 24 +BuildRequires: cuda-core-8-0, cuda-command-line-tools-8-0, cuda-cudart-dev-8-0, clang +%define cudaconf --with-cuda=$(find /usr/local/ -maxdepth 1 -type d -name 'cuda*' | sort -rn | head -n 1) --with-cuda-host-compiler=clang %else -BuildRequires: cuda-core-8-0,cuda-command-line-tools-8-0,cuda-cudart-dev-8-0,clang -%define cudaconf --with-cuda=/usr/local/cuda-8.0 --with-cuda-host-compiler=clang +BuildRequires: cuda-core-9-0, cuda-command-line-tools-9-0, cuda-cudart-dev-9-0, gcc < 7 +%define cudaconf --with-cuda=$(find /usr/local/ -maxdepth 1 -type d -name 'cuda*' | sort -rn | head -n 1) --with-cuda-host-compiler="$(basename "$(ls -1 /usr/bin/*gcc-6* | sort -rn | head -n 1)")" %endif BuildRequires: libgpujpeg-devel %else diff --git a/package_specs/ultragrid/_service.tpl b/package_specs/ultragrid/_service.tpl index d1f0e716b..ad012e916 100644 --- a/package_specs/ultragrid/_service.tpl +++ b/package_specs/ultragrid/_service.tpl @@ -5,7 +5,7 @@ 1.4 release/1.4 ultragrid - yes + no enable diff --git a/package_specs/ultragrid/ultragrid.spec.tpl b/package_specs/ultragrid/ultragrid.spec.tpl index c167de179..2db732cb2 100644 --- a/package_specs/ultragrid/ultragrid.spec.tpl +++ b/package_specs/ultragrid/ultragrid.spec.tpl @@ -41,12 +41,13 @@ BuildRequires: glib2-devel, libcurl-devel ##################################################### %if 0%{?cuda} > 0 -%if 0%{?fedora} > 1 && 0%{?fedora} < 21 -BuildRequires: cuda-core-6-5,cuda-command-line-tools-6-5,cuda-cudart-dev-6-5 -%define cudaconf --with-cuda=/usr/local/cuda-6.5 +%if 0%{?fedora} > 1 && 0%{?fedora} < 24 +BuildRequires: cuda-core-8-0, cuda-command-line-tools-8-0, cuda-cudart-dev-8-0, clang +%define cudaconf --with-cuda=$(find /usr/local/ -maxdepth 1 -type d -name 'cuda*' | sort -rn | head -n 1) --with-cuda-host-compiler=clang %else -BuildRequires: cuda-core-8-0,cuda-command-line-tools-8-0,cuda-cudart-dev-8-0,clang -%define cudaconf --with-cuda=/usr/local/cuda-8.0 --with-cuda-host-compiler=clang +BuildRequires: cuda-core-9-0, cuda-command-line-tools-9-0, cuda-cudart-dev-9-0, gcc < 7 +%define cudaconf --with-cuda=$(find /usr/local/ -maxdepth 1 -type d -name 'cuda*' | sort -rn | head -n 1) --with-cuda-host-compiler="$(basename "$(ls -1 /usr/bin/*gcc-6* | sort -rn | head -n 1)")" +BuildRequires: gcc-gfortran > 6.99 %endif BuildRequires: libgpujpeg-devel %else