diff --git a/package_specs/__disable_aja__.patch b/package_specs/__disable_aja__.patch index 83b8e3e85..8b20bff16 100644 --- a/package_specs/__disable_aja__.patch +++ b/package_specs/__disable_aja__.patch @@ -1,54 +1,54 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules ---- a/ultragrid/debian.rules 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/debian.rules 2017-04-06 12:57:41.137963755 +0200 -@@ -35,7 +35,7 @@ CARDCONF+=--enable-deltacast --with-delt +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:21:00.186229827 +0200 +@@ -42,7 +42,7 @@ CARDCONF_DELTACAST= --enable-deltacast - ##################################################### # > aja ##################################################### --CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk -+#CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk +-CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ++#CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ##################################################### # < aja ##################################################### diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl ---- a/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:41.177964446 +0200 -@@ -116,7 +116,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:21:00.150229160 +0200 +@@ -129,7 +129,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > aja ##################################################### -%define build_aja 1 -+#%define build_aja 1 ++#%%define build_aja 1 ##################################################### # < aja ##################################################### diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/debian.rules 2017-04-06 12:57:41.081962786 +0200 -@@ -35,7 +35,7 @@ CARDCONF+=--enable-deltacast --with-delt +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:21:00.130228789 +0200 +@@ -42,7 +42,7 @@ CARDCONF_DELTACAST= --enable-deltacast - ##################################################### # > aja ##################################################### --CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk -+#CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk +-CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ++#CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ##################################################### # < aja ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl ---- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:41.117963408 +0200 -@@ -115,7 +115,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:21:00.090228047 +0200 +@@ -129,7 +129,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > aja ##################################################### -%define build_aja 1 -+#%define build_aja 1 ++#%%define build_aja 1 ##################################################### # < aja ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:41.197964791 +0200 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:21:00.302231977 +0200 @@ -18,7 +18,7 @@ override_dh_auto_build: ##################################################### # > aja @@ -70,8 +70,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < aja ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:41.233965415 +0200 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:21:00.206230198 +0200 @@ -49,12 +49,12 @@ Patch13: bluefish-linux4.6-get-user-page ##################################################### # > aja (ntv2sdklinux) @@ -101,12 +101,12 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -+#%patch20 -p1 -+#%patch21 -p1 -+#%patch22 -p1 -+#%patch23 -p1 -+#%patch24 -p1 -+#%patch25 -p1 ++#%%patch20 -p1 ++#%%patch21 -p1 ++#%%patch22 -p1 ++#%%patch23 -p1 ++#%%patch24 -p1 ++#%%patch25 -p1 ##################################################### # < aja ##################################################### diff --git a/package_specs/__disable_blackmagick__.patch b/package_specs/__disable_blackmagick__.patch index dfdadf8d6..deb377065 100644 --- a/package_specs/__disable_blackmagick__.patch +++ b/package_specs/__disable_blackmagick__.patch @@ -1,54 +1,54 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules ---- a/ultragrid/debian.rules 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/debian.rules 2017-04-06 12:57:40.653955384 +0200 -@@ -21,7 +21,7 @@ CARDCONF+= --enable-dvs --with-dvs=/usr/ +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:20:59.706220930 +0200 +@@ -28,7 +28,7 @@ CARDCONF_DVS=--enable-dvs --with-dvs=/us ##################################################### # > blackmagick ##################################################### --CARDCONF+= --enable-decklink -+#CARDCONF+= --enable-decklink +-CARDCONF_DECKLINK= --enable-decklink ++#CARDCONF_DECKLINK= --enable-decklink ##################################################### # < blackmagick ##################################################### diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl ---- a/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.689956006 +0200 -@@ -102,7 +102,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.662220114 +0200 +@@ -115,7 +115,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > blackmagick ##################################################### -%define build_blackmagick 1 -+#%define build_blackmagick 1 ++#%%define build_blackmagick 1 ##################################################### # < blackmagick ##################################################### diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.593954345 +0200 -@@ -21,7 +21,7 @@ CARDCONF+= --enable-dvs --with-dvs=/usr/ +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.642219744 +0200 +@@ -28,7 +28,7 @@ CARDCONF_DVS=--enable-dvs --with-dvs=/us ##################################################### # > blackmagick ##################################################### --CARDCONF+= --enable-decklink -+#CARDCONF+= --enable-decklink +-CARDCONF_DECKLINK= --enable-decklink ++#CARDCONF_DECKLINK= --enable-decklink ##################################################### # < blackmagick ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl ---- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.633955038 +0200 -@@ -101,7 +101,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.606219075 +0200 +@@ -115,7 +115,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > blackmagick ##################################################### -%define build_blackmagick 1 -+#%define build_blackmagick 1 ++#%%define build_blackmagick 1 ##################################################### # < blackmagick ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.749957044 +0200 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.726221301 +0200 @@ -13,7 +13,7 @@ BuildRequires: %kernel_module_package_bu ##################################################### # > blackmagick (DesktopVideo) diff --git a/package_specs/__disable_bluefish__.patch b/package_specs/__disable_bluefish__.patch index 8b9562987..ad0f81084 100644 --- a/package_specs/__disable_bluefish__.patch +++ b/package_specs/__disable_bluefish__.patch @@ -1,54 +1,54 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules ---- a/ultragrid/debian.rules 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/debian.rules 2017-04-06 12:57:41.377967906 +0200 -@@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-archi +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:21:00.422234200 +0200 +@@ -14,7 +14,7 @@ CUDA=--disable-cuda ##################################################### # > bluefish ##################################################### --CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk -+#CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk +-CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ++#CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ##################################################### # < bluefish ##################################################### diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl ---- a/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:41.417968598 +0200 -@@ -88,7 +88,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:21:00.386233534 +0200 +@@ -101,7 +101,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > bluefish ##################################################### -%define build_bluefish 1 -+#%define build_bluefish 1 ++#%%define build_bluefish 1 ##################################################### # < bluefish ##################################################### diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/debian.rules 2017-04-06 12:57:41.317966868 +0200 -@@ -7,7 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-archi +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:21:00.366233163 +0200 +@@ -14,7 +14,7 @@ CUDA=--disable-cuda ##################################################### # > bluefish ##################################################### --CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk -+#CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk +-CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ++#CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ##################################################### # < bluefish ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl ---- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:41.357967560 +0200 -@@ -87,7 +87,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:21:00.330232496 +0200 +@@ -101,7 +101,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > bluefish ##################################################### -%define build_bluefish 1 -+#%define build_bluefish 1 ++#%%define build_bluefish 1 ##################################################### # < bluefish ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:41.437968943 +0200 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:21:00.538236350 +0200 @@ -25,8 +25,8 @@ override_dh_auto_build: ##################################################### # > bluefish @@ -78,8 +78,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < bluefish ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:41.477969634 +0200 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:21:00.446234646 +0200 @@ -39,10 +39,10 @@ Patch1: videoMasterHD-linux4.6-get-user ##################################################### # > bluefish (EpochLinuxDriver) @@ -103,10 +103,10 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -+#%patch10 -p1 -+#%patch11 -p1 -+#%patch12 -p1 -+#%patch13 -p1 ++#%%patch10 -p1 ++#%%patch11 -p1 ++#%%patch12 -p1 ++#%%patch13 -p1 ##################################################### # < bluefish ##################################################### diff --git a/package_specs/__disable_cuda__.patch b/package_specs/__disable_cuda__.patch new file mode 100644 index 000000000..5f2aae32c --- /dev/null +++ b/package_specs/__disable_cuda__.patch @@ -0,0 +1,48 @@ +diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:21:00.658238574 +0200 +@@ -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 + ##################################################### + # < cuda + ##################################################### +diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:21:00.622237908 +0200 +@@ -35,7 +35,7 @@ BuildRequires: glib2-devel, libcurl-deve + ##################################################### + # > cuda + ##################################################### +-%define cuda 1 ++#%%define cuda 1 + ##################################################### + # < cuda + ##################################################### +diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:21:00.602237537 +0200 +@@ -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 + ##################################################### + # < cuda + ##################################################### +diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:21:00.566236870 +0200 +@@ -35,7 +35,7 @@ BuildRequires: glib2-devel, libcurl-deve + ##################################################### + # > cuda + ##################################################### +-%define cuda 1 ++#%%define cuda 1 + ##################################################### + # < cuda + ##################################################### diff --git a/package_specs/__disable_deltacast__.patch b/package_specs/__disable_deltacast__.patch index f97c67205..e06c3706d 100644 --- a/package_specs/__disable_deltacast__.patch +++ b/package_specs/__disable_deltacast__.patch @@ -1,54 +1,54 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules ---- a/ultragrid/debian.rules 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/debian.rules 2017-04-06 12:57:40.409951165 +0200 -@@ -28,7 +28,7 @@ CARDCONF+= --enable-decklink +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:20:59.462216407 +0200 +@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink ##################################################### # > deltacast ##################################################### --CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk -+#CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk +-CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ++#CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ##################################################### # < deltacast ##################################################### diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl ---- a/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.445951786 +0200 -@@ -109,7 +109,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.426215740 +0200 +@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > deltacast ##################################################### -%define build_deltacast 1 -+#%define build_deltacast 1 ++#%%define build_deltacast 1 ##################################################### # < deltacast ##################################################### diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.353950197 +0200 -@@ -28,7 +28,7 @@ CARDCONF+= --enable-decklink +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.406215369 +0200 +@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink ##################################################### # > deltacast ##################################################### --CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk -+#CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk +-CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ++#CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ##################################################### # < deltacast ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl ---- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.389950819 +0200 -@@ -108,7 +108,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.370214701 +0200 +@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > deltacast ##################################################### -%define build_deltacast 1 -+#%define build_deltacast 1 ++#%%define build_deltacast 1 ##################################################### # < deltacast ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.469952202 +0200 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:20:59.578218557 +0200 @@ -68,14 +68,14 @@ override_dh_auto_install: ##################################################### # > deltacast @@ -73,8 +73,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < deltacast ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.505952825 +0200 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.486216851 +0200 @@ -31,8 +31,8 @@ Source1: ultragrid-proprietary-drivers-r ##################################################### # > deltacast (videoMasterHD) @@ -92,8 +92,8 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ ##################################################### -%patch0 -p1 -%patch1 -p1 -+#%patch0 -p1 -+#%patch1 -p1 ++#%%patch0 -p1 ++#%%patch1 -p1 ##################################################### # < deltacast ##################################################### diff --git a/package_specs/__disable_dvs__.patch b/package_specs/__disable_dvs__.patch index 9948d14af..ea63a773e 100644 --- a/package_specs/__disable_dvs__.patch +++ b/package_specs/__disable_dvs__.patch @@ -1,54 +1,54 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules ---- a/ultragrid/debian.rules 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/debian.rules 2017-04-06 12:57:40.893959535 +0200 -@@ -14,7 +14,7 @@ CARDCONF+= --enable-bluefish444 --enable +--- a/ultragrid/debian.rules 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/debian.rules 2017-04-07 13:20:59.946225377 +0200 +@@ -21,7 +21,7 @@ CARDCONF_BLUEFISH=--enable-bluefish444 - ##################################################### # > dvs ##################################################### --CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk -+#CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk +-CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ++#CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ##################################################### # < dvs ##################################################### diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl ---- a/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.321949643 +0200 -+++ b/ultragrid/ultragrid.spec.tpl 2017-04-06 12:57:40.929960156 +0200 -@@ -95,7 +95,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.342214183 +0200 ++++ b/ultragrid/ultragrid.spec.tpl 2017-04-07 13:20:59.906224637 +0200 +@@ -108,7 +108,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > dvs ##################################################### -%define build_dvs 1 -+#%define build_dvs 1 ++#%%define build_dvs 1 ##################################################### # < dvs ##################################################### diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/debian.rules 2017-04-06 12:57:40.833958496 +0200 -@@ -14,7 +14,7 @@ CARDCONF+= --enable-bluefish444 --enable +--- a/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-07 13:20:59.886224266 +0200 +@@ -21,7 +21,7 @@ CARDCONF_BLUEFISH=--enable-bluefish444 - ##################################################### # > dvs ##################################################### --CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk -+#CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk +-CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ++#CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ##################################################### # < dvs ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl ---- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.317949573 +0200 -+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-06 12:57:40.873959189 +0200 -@@ -94,7 +94,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.338214108 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-04-07 13:20:59.850223598 +0200 +@@ -108,7 +108,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > dvs ##################################################### -%define build_dvs 1 -+#%define build_dvs 1 ++#%%define build_dvs 1 ##################################################### # < dvs ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-06 12:57:40.957960641 +0200 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-07 13:21:00.062227527 +0200 @@ -50,10 +50,10 @@ override_dh_auto_install: ##################################################### # > dvs @@ -65,8 +65,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < dvs ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.325949712 +0200 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-06 12:57:40.997961334 +0200 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.346214257 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-07 13:20:59.966225748 +0200 @@ -61,7 +61,7 @@ Patch25: AJA-linux4.6-get-user-pages.pat ##################################################### # > dvs (sdk) @@ -81,7 +81,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ # > dvs (sdk) ##################################################### -%patch30 -p1 -+#%patch30 -p1 ++#%%patch30 -p1 ##################################################### # < dvs (sdk) ##################################################### diff --git a/package_specs/generate-patches.sh b/package_specs/generate-patches.sh index f0557cae8..898473274 100755 --- a/package_specs/generate-patches.sh +++ b/package_specs/generate-patches.sh @@ -2,7 +2,7 @@ scriptroot="$(dirname "$(realpath "$0")")" -vendors=( deltacast blackmagick dvs aja bluefish ) +vendors=( deltacast blackmagick dvs aja bluefish cuda ) subpackages=( ultragrid-nightly ultragrid ultragrid-proprietary-drivers ) mkdir a diff --git a/package_specs/ultragrid-nightly/debian.rules b/package_specs/ultragrid-nightly/debian.rules index ee0ca57d8..6d2e1f0f3 100644 --- a/package_specs/ultragrid-nightly/debian.rules +++ b/package_specs/ultragrid-nightly/debian.rules @@ -4,49 +4,57 @@ SHELL=/bin/bash DEB_UPSTREAM_URL = https://github.com/CESNET/UltraGrid DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +CARDCONF_BLUEFISH=--disable-bluefish444 --disable-blue-audio +CARDCONF_DVS=--disable-dvs +CARDCONF_DECKLINK=--disable-decklink +CARDCONF_DECKLINK=--disable-deltacast +CARDCONF_AJA=--disable-aja +CUDA=--disable-cuda + ##################################################### # > bluefish ##################################################### -CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk +CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ##################################################### # < bluefish ##################################################### ##################################################### # > dvs ##################################################### -CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk +CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ##################################################### # < dvs ##################################################### ##################################################### # > blackmagick ##################################################### -CARDCONF+= --enable-decklink +CARDCONF_DECKLINK= --enable-decklink ##################################################### # < blackmagick ##################################################### ##################################################### # > deltacast ##################################################### -CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk +CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ##################################################### # < deltacast ##################################################### ##################################################### # > aja ##################################################### -CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk +CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ##################################################### # < aja ##################################################### ##################################################### # > cuda ##################################################### -CUDA:=--with-cuda=/usr/local/cuda-8.0 +CUDA=--with-cuda=/usr/local/cuda-8.0 --enable-jpeg ##################################################### # < cuda ##################################################### +CARDCONF=$(CARDCONF_BLUEFISH) $(CARDCONF_DVS) $(CARDCONF_DECKLINK) $(CARDCONF_DECKLINK) $(CARDCONF_AJA) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) UGLIBDIR=$(LIBDIR)/ultragrid @@ -56,7 +64,7 @@ UGLIBDIR=$(LIBDIR)/ultragrid override_dh_auto_configure: ./autogen.sh || true dh_auto_configure -- --disable-profile --libdir=$(LIBDIR) --disable-debug --enable-ipv6 --enable-plugins \ - --enable-sdl --enable-gl --enable-rtdxt --enable-jpeg \ + --enable-sdl --enable-gl --enable-rtdxt \ --enable-portaudio --disable-jack-transport --enable-jack \ --enable-alsa --enable-scale --enable-qt --disable-quicktime \ --disable-coreaudio --disable-sage --enable-screen\ diff --git a/package_specs/ultragrid-nightly/ultragrid-nightly.dsc.tpl b/package_specs/ultragrid-nightly/ultragrid-nightly.dsc.tpl index e1a55721b..c12de6411 100644 --- a/package_specs/ultragrid-nightly/ultragrid-nightly.dsc.tpl +++ b/package_specs/ultragrid-nightly/ultragrid-nightly.dsc.tpl @@ -8,6 +8,4 @@ Binary: ultragrid-nightly Architecture: any Version: 1.4-2017040100 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, libqt4-gui, 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, cuda-core-7-0, cuda-command-line-tools-7-0, cuda-cudart-dev-7-0, libnvvm2, libglib2.0-dev, libcurl4-openssl-dev, git -# dummy, protoze jsem tomu asi smazal spatny soubor z srv 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, libglib2.0-dev, libcurl4-openssl-dev, git, nvidia-cuda-toolkit (>= 5.0) diff --git a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl index 64a742d84..e64aba1af 100644 --- a/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl +++ b/package_specs/ultragrid-nightly/ultragrid-nightly.spec.tpl @@ -15,7 +15,6 @@ BuildRequires: qt-x11,qt-devel,libX11-devel BuildRequires: portaudio-devel,jack-audio-connection-kit-devel,alsa-lib-devel,libv4l-devel BuildRequires: zip,kernel-headers BuildRequires: openssl-devel -BuildRequires: libgpujpeg-devel BuildRequires: opencv-devel # bug @@ -33,10 +32,25 @@ BuildRequires: libjpeg62-devel,Mesa-libGL-devel %endif BuildRequires: glib2-devel, libcurl-devel +##################################################### +# > cuda +##################################################### +%define cuda 1 +##################################################### +# < cuda +##################################################### + +%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 %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 +%endif +BuildRequires: libgpujpeg-devel +%else +%define cudaconf --disable-cuda %endif %define build_conference 1 @@ -133,7 +147,7 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. # jack-transport is broken since 1.2 release # rstp is broken with current live555 %configure --docdir=%_docdir --disable-profile --disable-debug --enable-ipv6 --enable-plugins \ - --enable-sdl --enable-gl --enable-rtdxt --enable-jpeg \ + --enable-sdl --enable-gl --enable-rtdxt \ --enable-portaudio --disable-jack-transport --enable-jack \ --enable-alsa --enable-scale --enable-qt --disable-quicktime \ --disable-coreaudio --disable-sage --enable-screen\ @@ -145,25 +159,36 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. %else --disable-video-mixer \ %endif - %if 0%{?fedora} > 1 && 0%{?fedora} < 21 - --with-cuda=/usr/local/cuda-6.5 \ + %{?cudaconf} \ + %if 0%{?cuda} > 0 + --enable-jpeg \ %else - --with-cuda=/usr/local/cuda-8.0 --with-cuda-host-compiler=clang \ + --disable-jpeg \ %endif %if 0%{?build_bluefish} > 0 --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk \ + %else + --disable-bluefish444 --disable-blue-audio \ %endif %if 0%{?build_dvs} > 0 --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk \ + %else + --disable-dvs \ %endif %if 0%{?build_blackmagick} > 0 --enable-decklink \ + %else + --disable-decklink \ %endif %if 0%{?build_deltacast} > 0 --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk \ + %else + --disable-deltacast \ %endif %if 0%{?build_aja} > 0 - --with-aja=/usr/src/ultragrid-externals/aja_sdk \ + --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk \ + %else + --disable-aja \ %endif LDFLAGS="$LDFLAGS -Wl,-rpath=%{UGLIBDIR}" \ # --enable-testcard-extras \ @@ -175,9 +200,10 @@ rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/ultragrid echo %{version}-%{release} > ${RPM_BUILD_ROOT}/%{_datadir}/ultragrid/ultragrid-nightly.version - +%if 0%{?cuda} > 0 # copy the real cudart to our rpath sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E '^[[:space:]]+' | sed -r "s#[[:space:]]+([^[:space:]]+)[[:space:]]+=>[[:space:]]+([^[:space:]].*)[[:space:]]+[(][^)]+[)]#cp \"\$(realpath '\2')\" '${RPM_BUILD_ROOT}/%{UGLIBDIR}/\1'#g" | uniq | tr $'\n' ';')" +%endif %files %defattr(-,root,root,-) @@ -226,10 +252,6 @@ sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E %{_libdir}/ultragrid/module_vcompress_rtdxt.so %{_libdir}/ultragrid/module_vdecompress_rtdxt.so %{_libdir}/ultragrid/module_vcompress_uyvy.so -%{_libdir}/ultragrid/module_vcompress_jpeg.so -%{_libdir}/ultragrid/module_vdecompress_jpeg.so -%{_libdir}/ultragrid/module_vcompress_cuda_dxt.so -%{_libdir}/ultragrid/module_vdecompress_jpeg_to_dxt.so %{_libdir}/ultragrid/module_acap_portaudio.so %{_libdir}/ultragrid/module_aplay_portaudio.so %{_libdir}/ultragrid/module_acap_jack.so @@ -243,9 +265,15 @@ sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E %{_libdir}/ultragrid/module_vdecompress_libavcodec.so %{_libdir}/ultragrid/module_acompress_libavcodec.so %{_libdir}/ultragrid/module_openssl.so +%if 0%{?cuda} > 0 +%{_libdir}/ultragrid/module_vcompress_jpeg.so +%{_libdir}/ultragrid/module_vdecompress_jpeg.so +%{_libdir}/ultragrid/module_vcompress_cuda_dxt.so +%{_libdir}/ultragrid/module_vdecompress_jpeg_to_dxt.so %{_libdir}/ultragrid/module_ldgm_gpu.so # cudart %{_libdir}/ultragrid/*cudart* +%endif %changelog * Fri Mar 31 2017 Ultragrid Development Team 1.4-20170401 diff --git a/package_specs/ultragrid/debian.rules b/package_specs/ultragrid/debian.rules index ee0ca57d8..6d2e1f0f3 100644 --- a/package_specs/ultragrid/debian.rules +++ b/package_specs/ultragrid/debian.rules @@ -4,49 +4,57 @@ SHELL=/bin/bash DEB_UPSTREAM_URL = https://github.com/CESNET/UltraGrid DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +CARDCONF_BLUEFISH=--disable-bluefish444 --disable-blue-audio +CARDCONF_DVS=--disable-dvs +CARDCONF_DECKLINK=--disable-decklink +CARDCONF_DECKLINK=--disable-deltacast +CARDCONF_AJA=--disable-aja +CUDA=--disable-cuda + ##################################################### # > bluefish ##################################################### -CARDCONF+= --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk +CARDCONF_BLUEFISH=--enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk ##################################################### # < bluefish ##################################################### ##################################################### # > dvs ##################################################### -CARDCONF+= --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk +CARDCONF_DVS=--enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk ##################################################### # < dvs ##################################################### ##################################################### # > blackmagick ##################################################### -CARDCONF+= --enable-decklink +CARDCONF_DECKLINK= --enable-decklink ##################################################### # < blackmagick ##################################################### ##################################################### # > deltacast ##################################################### -CARDCONF+=--enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk +CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk ##################################################### # < deltacast ##################################################### ##################################################### # > aja ##################################################### -CARDCONF+=--with-aja=/usr/src/ultragrid-externals/aja_sdk +CARDCONF_AJA= --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk ##################################################### # < aja ##################################################### ##################################################### # > cuda ##################################################### -CUDA:=--with-cuda=/usr/local/cuda-8.0 +CUDA=--with-cuda=/usr/local/cuda-8.0 --enable-jpeg ##################################################### # < cuda ##################################################### +CARDCONF=$(CARDCONF_BLUEFISH) $(CARDCONF_DVS) $(CARDCONF_DECKLINK) $(CARDCONF_DECKLINK) $(CARDCONF_AJA) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) UGLIBDIR=$(LIBDIR)/ultragrid @@ -56,7 +64,7 @@ UGLIBDIR=$(LIBDIR)/ultragrid override_dh_auto_configure: ./autogen.sh || true dh_auto_configure -- --disable-profile --libdir=$(LIBDIR) --disable-debug --enable-ipv6 --enable-plugins \ - --enable-sdl --enable-gl --enable-rtdxt --enable-jpeg \ + --enable-sdl --enable-gl --enable-rtdxt \ --enable-portaudio --disable-jack-transport --enable-jack \ --enable-alsa --enable-scale --enable-qt --disable-quicktime \ --disable-coreaudio --disable-sage --enable-screen\ diff --git a/package_specs/ultragrid/ultragrid.spec.tpl b/package_specs/ultragrid/ultragrid.spec.tpl index 30117d47b..ba64879c5 100644 --- a/package_specs/ultragrid/ultragrid.spec.tpl +++ b/package_specs/ultragrid/ultragrid.spec.tpl @@ -15,7 +15,6 @@ BuildRequires: qt-x11,qt-devel,libX11-devel BuildRequires: portaudio-devel,jack-audio-connection-kit-devel,alsa-lib-devel,libv4l-devel BuildRequires: zip,kernel-headers BuildRequires: openssl-devel -BuildRequires: libgpujpeg-devel BuildRequires: opencv-devel # bug @@ -33,10 +32,25 @@ BuildRequires: libjpeg62-devel,Mesa-libGL-devel %endif BuildRequires: glib2-devel, libcurl-devel +##################################################### +# > cuda +##################################################### +%define cuda 1 +##################################################### +# < cuda +##################################################### + +%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 %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 +%endif +BuildRequires: libgpujpeg-devel +%else +%define cudaconf --disable-cuda %endif %define build_conference 1 @@ -133,7 +147,7 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. # jack-transport is broken since 1.2 release # rstp is broken with current live555 %configure --docdir=%_docdir --disable-profile --disable-debug --enable-ipv6 --enable-plugins \ - --enable-sdl --enable-gl --enable-rtdxt --enable-jpeg \ + --enable-sdl --enable-gl --enable-rtdxt \ --enable-portaudio --disable-jack-transport --enable-jack \ --enable-alsa --enable-scale --enable-qt --disable-quicktime \ --disable-coreaudio --disable-sage --enable-screen\ @@ -145,25 +159,36 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. %else --disable-video-mixer \ %endif - %if 0%{?fedora} > 1 && 0%{?fedora} < 21 - --with-cuda=/usr/local/cuda-6.5 \ + %{?cudaconf} \ + %if 0%{?cuda} > 0 + --enable-jpeg \ %else - --with-cuda=/usr/local/cuda-8.0 --with-cuda-host-compiler=clang \ + --disable-jpeg \ %endif %if 0%{?build_bluefish} > 0 --enable-bluefish444 --enable-blue-audio --with-bluefish444=/usr/src/ultragrid-externals/bluefish_sdk \ + %else + --disable-bluefish444 --disable-blue-audio \ %endif %if 0%{?build_dvs} > 0 --enable-dvs --with-dvs=/usr/src/ultragrid-externals/dvs_sdk \ + %else + --disable-dvs \ %endif %if 0%{?build_blackmagick} > 0 --enable-decklink \ + %else + --disable-decklink \ %endif %if 0%{?build_deltacast} > 0 --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk \ + %else + --disable-deltacast \ %endif %if 0%{?build_aja} > 0 - --with-aja=/usr/src/ultragrid-externals/aja_sdk \ + --enable-aja --with-aja=/usr/src/ultragrid-externals/aja_sdk \ + %else + --disable-aja \ %endif LDFLAGS="$LDFLAGS -Wl,-rpath=%{UGLIBDIR}" \ # --enable-testcard-extras \ @@ -175,9 +200,10 @@ rm -rf ${RPM_BUILD_ROOT} make install DESTDIR=${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/ultragrid echo %{version}-%{release} > ${RPM_BUILD_ROOT}/%{_datadir}/ultragrid/ultragrid.version - +%if 0%{?cuda} > 0 # copy the real cudart to our rpath sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E '^[[:space:]]+' | sed -r "s#[[:space:]]+([^[:space:]]+)[[:space:]]+=>[[:space:]]+([^[:space:]].*)[[:space:]]+[(][^)]+[)]#cp \"\$(realpath '\2')\" '${RPM_BUILD_ROOT}/%{UGLIBDIR}/\1'#g" | uniq | tr $'\n' ';')" +%endif %files %defattr(-,root,root,-) @@ -226,10 +252,6 @@ sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E %{_libdir}/ultragrid/module_vcompress_rtdxt.so %{_libdir}/ultragrid/module_vdecompress_rtdxt.so %{_libdir}/ultragrid/module_vcompress_uyvy.so -%{_libdir}/ultragrid/module_vcompress_jpeg.so -%{_libdir}/ultragrid/module_vdecompress_jpeg.so -%{_libdir}/ultragrid/module_vcompress_cuda_dxt.so -%{_libdir}/ultragrid/module_vdecompress_jpeg_to_dxt.so %{_libdir}/ultragrid/module_acap_portaudio.so %{_libdir}/ultragrid/module_aplay_portaudio.so %{_libdir}/ultragrid/module_acap_jack.so @@ -243,9 +265,15 @@ sh -c "$(ldd bin/uv $(find . -name '*.so*') 2>/dev/null | grep cudart | grep -E %{_libdir}/ultragrid/module_vdecompress_libavcodec.so %{_libdir}/ultragrid/module_acompress_libavcodec.so %{_libdir}/ultragrid/module_openssl.so +%if 0%{?cuda} > 0 +%{_libdir}/ultragrid/module_vcompress_jpeg.so +%{_libdir}/ultragrid/module_vdecompress_jpeg.so +%{_libdir}/ultragrid/module_vcompress_cuda_dxt.so +%{_libdir}/ultragrid/module_vdecompress_jpeg_to_dxt.so %{_libdir}/ultragrid/module_ldgm_gpu.so # cudart %{_libdir}/ultragrid/*cudart* +%endif %changelog * Fri Mar 31 2017 Ultragrid Development Team 1.4-20170401