Packaging: froze & forked of proprietary drivers for ultragrid 1.4 (1/3)

This commit is contained in:
Lukas Rucka
2017-12-15 16:00:24 +01:00
parent aa45fb561f
commit e8fde502d8
36 changed files with 2165 additions and 81 deletions

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:29.988841463 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:16.094070304 +0100
@@ -42,7 +42,7 @@ CARDCONF_DELTACAST= --enable-deltacast -
#####################################################
# > aja
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < aja
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:29.940841303 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:16.054069607 +0100
@@ -129,7 +129,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > aja
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < aja
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:29.908841196 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:16.034069259 +0100
@@ -42,7 +42,7 @@ CARDCONF_DELTACAST= --enable-deltacast -
#####################################################
# > aja
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:29.852841009 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:15.990068495 +0100
@@ -129,7 +129,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > aja
@@ -47,8 +47,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ul
# < aja
#####################################################
diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules
--- a/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:30.140841973 +0200
--- a/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:16.226072602 +0100
@@ -18,7 +18,7 @@ override_dh_auto_build:
#####################################################
# > aja
@@ -70,9 +70,9 @@ 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-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-05-19 15:14:30.016841557 +0200
@@ -49,12 +49,12 @@ Patch13: bluefish-linux4.6-get-user-page
--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:16.118070721 +0100
@@ -51,12 +51,12 @@ Patch13: bluefish-linux4.6-get-user-page
#####################################################
# > aja (ntv2sdklinux)
#####################################################
@@ -91,7 +91,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < aja (ntv2sdklinux)
#####################################################
@@ -97,12 +97,12 @@ VideoMasterHD --deltacast
@@ -99,12 +99,12 @@ VideoMasterHD --deltacast
#####################################################
# > aja
#####################################################
@@ -110,7 +110,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < aja
#####################################################
@@ -120,10 +120,10 @@ VideoMasterHD --deltacast
@@ -122,10 +122,10 @@ VideoMasterHD --deltacast
#####################################################
# > aja
#####################################################
@@ -125,7 +125,97 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < aja
#####################################################
@@ -175,8 +175,8 @@ rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-
@@ -177,8 +177,8 @@ rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-
#####################################################
# > aja
#####################################################
-cp -r ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
-ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/aja_sdk
+#cp -r ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
+#ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/aja_sdk
#####################################################
# < aja
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/debian.rules b/ultragrid-proprietary-drivers-1.4/debian.rules
--- a/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:16.354074830 +0100
@@ -18,7 +18,7 @@ override_dh_auto_build:
#####################################################
# > aja
#####################################################
- cd ntv2sdklinux*/ntv2projects ; make QTDIR=/usr/lib/qt5
+# cd ntv2sdklinux*/ntv2projects ; make QTDIR=/usr/lib/qt5
#####################################################
# < aja
#####################################################
@@ -60,8 +60,8 @@ override_dh_auto_install:
#####################################################
# > aja
#####################################################
- cp -r ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
- ln -s ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/aja_sdk
+# cp -r ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
+# ln -s ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/aja_sdk
#####################################################
# < aja
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec
--- a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:16.246072950 +0100
@@ -52,12 +52,12 @@ Patch13: bluefish-linux4.6-get-user-page
#####################################################
# > aja (ntv2sdklinux)
#####################################################
-Patch20: AJA-linuxdriver-uname.patch
-Patch21: AJA-nodemo.patch
-Patch22: AJA-qmake.patch
-Patch23: AJA-qt5.patch
-Patch24: AJA-gcc-explicit-constructors.patch
-Patch25: AJA-linux4.6-get-user-pages.patch
+#Patch20: AJA-linuxdriver-uname.patch
+#Patch21: AJA-nodemo.patch
+#Patch22: AJA-qmake.patch
+#Patch23: AJA-qt5.patch
+#Patch24: AJA-gcc-explicit-constructors.patch
+#Patch25: AJA-linux4.6-get-user-pages.patch
#####################################################
# < aja (ntv2sdklinux)
#####################################################
@@ -100,12 +100,12 @@ VideoMasterHD --deltacast
#####################################################
# > aja
#####################################################
-%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
#####################################################
@@ -123,10 +123,10 @@ VideoMasterHD --deltacast
#####################################################
# > aja
#####################################################
-ls
-pushd ntv2sdklinux_*/ntv2projects
-env libdir=%{_libdir} make QTDIR=/usr/lib/qt5
-popd
+#ls
+#pushd ntv2sdklinux_*/ntv2projects
+#env libdir=%{_libdir} make QTDIR=/usr/lib/qt5
+#popd
#####################################################
# < aja
#####################################################
@@ -178,8 +178,8 @@ rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-
#####################################################
# > aja
#####################################################

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:29.340839294 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:15.254055682 +0100
@@ -28,7 +28,7 @@ CARDCONF_DVS=--enable-dvs --with-dvs=/us
#####################################################
# > blackmagick
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < blackmagick
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:29.284839105 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:15.210054916 +0100
@@ -115,7 +115,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > blackmagick
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < blackmagick
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:29.244838972 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:15.186054498 +0100
@@ -28,7 +28,7 @@ CARDCONF_DVS=--enable-dvs --with-dvs=/us
#####################################################
# > blackmagick
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:29.196838811 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:15.146053802 +0100
@@ -115,7 +115,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > blackmagick
@@ -47,9 +47,21 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ul
# < 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-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-05-19 15:14:29.368839387 +0200
@@ -13,7 +13,7 @@ BuildRequires: %kernel_module_package_bu
--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:15.274056030 +0100
@@ -15,7 +15,7 @@ BuildRequires: %kernel_module_package_bu
#####################################################
# > blackmagick (DesktopVideo)
#####################################################
-Requires: desktopvideo
+#Requires: desktopvideo
#####################################################
# < blackmagick (Desktopvideo)
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec
--- a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:15.402058258 +0100
@@ -16,7 +16,7 @@ BuildRequires: %kernel_module_package_bu
#####################################################
# > blackmagick (DesktopVideo)
#####################################################

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:30.296842496 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:16.498077336 +0100
@@ -14,7 +14,7 @@ CUDA=--disable-cuda
#####################################################
# > bluefish
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < bluefish
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:30.252842348 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:16.454076570 +0100
@@ -101,7 +101,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > bluefish
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < bluefish
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:30.224842254 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:16.430076152 +0100
@@ -14,7 +14,7 @@ CUDA=--disable-cuda
#####################################################
# > bluefish
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:30.176842094 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:16.386075386 +0100
@@ -101,7 +101,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > bluefish
@@ -47,8 +47,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ul
# < bluefish
#####################################################
diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules
--- a/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:30.448843004 +0200
--- a/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:16.622079495 +0100
@@ -25,8 +25,8 @@ override_dh_auto_build:
#####################################################
# > bluefish
@@ -78,9 +78,9 @@ 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-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-05-19 15:14:30.328842603 +0200
@@ -39,10 +39,10 @@ Patch1: videoMasterHD-linux4.6-get-user
--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:16.518077684 +0100
@@ -41,10 +41,10 @@ Patch1: videoMasterHD-linux4.6-get-user
#####################################################
# > bluefish (EpochLinuxDriver)
#####################################################
@@ -95,7 +95,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < bluefish (EpochLinuxDriver)
#####################################################
@@ -87,10 +87,10 @@ VideoMasterHD --deltacast
@@ -89,10 +89,10 @@ VideoMasterHD --deltacast
#####################################################
# > bluefish
#####################################################
@@ -110,7 +110,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < bluefish
#####################################################
@@ -131,12 +131,12 @@ popd
@@ -133,12 +133,12 @@ popd
#####################################################
# > bluefish
#####################################################
@@ -129,7 +129,115 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < bluefish
#####################################################
@@ -150,15 +150,15 @@ mkdir -p $RPM_BUILD_ROOT/usr/src/ultragr
@@ -152,15 +152,15 @@ mkdir -p $RPM_BUILD_ROOT/usr/src/ultragr
#####################################################
# > bluefish
#####################################################
-cp -r EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
-ln -s EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/bluefish_sdk
-
-pushd EpochLinuxDriver_V5*/drivers/orac
-env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
-popd
-pushd EpochLinuxDriver_V5*/apis/BlueVelvet
-env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
-popd
+#cp -r EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
+#ln -s EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/bluefish_sdk
+#
+#pushd EpochLinuxDriver_V5*/drivers/orac
+#env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
+#popd
+#pushd EpochLinuxDriver_V5*/apis/BlueVelvet
+#env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
+#popd
#####################################################
# < bluefish
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/debian.rules b/ultragrid-proprietary-drivers-1.4/debian.rules
--- a/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:16.754081793 +0100
@@ -25,8 +25,8 @@ override_dh_auto_build:
#####################################################
# > bluefish
#####################################################
- cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make
- cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make
+# cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make
+# cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make
#####################################################
# < bluefish
#####################################################
@@ -39,11 +39,11 @@ override_dh_auto_install:
#####################################################
# > bluefish
#####################################################
- cp -r EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
- ln -s EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/bluefish_sdk
-
- cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
- cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
+# cp -r EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
+# ln -s EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/bluefish_sdk
+#
+# cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
+# cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
#####################################################
# < bluefish
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec
--- a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:16.642079843 +0100
@@ -42,10 +42,10 @@ Patch1: videoMasterHD-linux4.6-get-user
#####################################################
# > bluefish (EpochLinuxDriver)
#####################################################
-Patch10: bluefish-uname.patch
-Patch11: bluefish-g++.patch
-Patch12: bluefish-destdir.patch
-Patch13: bluefish-linux4.6-get-user-pages.patch
+#Patch10: bluefish-uname.patch
+#Patch11: bluefish-g++.patch
+#Patch12: bluefish-destdir.patch
+#Patch13: bluefish-linux4.6-get-user-pages.patch
#####################################################
# < bluefish (EpochLinuxDriver)
#####################################################
@@ -90,10 +90,10 @@ VideoMasterHD --deltacast
#####################################################
# > bluefish
#####################################################
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
+#%%patch10 -p1
+#%%patch11 -p1
+#%%patch12 -p1
+#%%patch13 -p1
#####################################################
# < bluefish
#####################################################
@@ -134,12 +134,12 @@ popd
#####################################################
# > bluefish
#####################################################
-pushd EpochLinuxDriver_V5*/drivers/orac
-env libdir=%{_libdir} make
-popd
-pushd EpochLinuxDriver_V5*/apis/BlueVelvet
-env libdir=%{_libdir} make
-popd
+#pushd EpochLinuxDriver_V5*/drivers/orac
+#env libdir=%{_libdir} make
+#popd
+#pushd EpochLinuxDriver_V5*/apis/BlueVelvet
+#env libdir=%{_libdir} make
+#popd
#####################################################
# < bluefish
#####################################################
@@ -153,15 +153,15 @@ mkdir -p $RPM_BUILD_ROOT/usr/src/ultragr
#####################################################
# > bluefish
#####################################################

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:30.616843567 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:16.906084438 +0100
@@ -49,7 +49,7 @@ CARDCONF_AJA= --enable-aja --with-aja=/u
#####################################################
# > cuda
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < cuda
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:30.568843406 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:16.862083672 +0100
@@ -35,7 +35,7 @@ BuildRequires: glib2-devel, libcurl-deve
#####################################################
# > cuda
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < cuda
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:30.544843326 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:16.834083186 +0100
@@ -49,7 +49,7 @@ CARDCONF_AJA= --enable-aja --with-aja=/u
#####################################################
# > cuda
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:30.496843166 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:16.786082349 +0100
@@ -35,7 +35,7 @@ BuildRequires: glib2-devel, libcurl-deve
#####################################################
# > cuda

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:28.976838074 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:14.850048650 +0100
@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink
#####################################################
# > deltacast
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < deltacast
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.912837859 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.802047814 +0100
@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > deltacast
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < deltacast
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.884837766 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.774047327 +0100
@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink
#####################################################
# > deltacast
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:28.820837551 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.722046422 +0100
@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > deltacast
@@ -47,8 +47,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ul
# < deltacast
#####################################################
diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules
--- a/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:29.156838676 +0200
--- a/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:14.982050947 +0100
@@ -68,14 +68,14 @@ override_dh_auto_install:
#####################################################
# > deltacast
@@ -73,9 +73,9 @@ 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-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-05-19 15:14:29.012838195 +0200
@@ -31,8 +31,8 @@ Source1: ultragrid-proprietary-drivers-r
--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.874049069 +0100
@@ -33,8 +33,8 @@ Source1: ultragrid-proprietary-drivers-r
#####################################################
# > deltacast (videoMasterHD)
#####################################################
@@ -86,7 +86,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < deltacast (videoMasterHD)
#####################################################
@@ -79,8 +79,8 @@ VideoMasterHD --deltacast
@@ -81,8 +81,8 @@ VideoMasterHD --deltacast
#####################################################
# > deltacast
#####################################################
@@ -97,7 +97,95 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < deltacast
#####################################################
@@ -183,21 +183,21 @@ ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr
@@ -185,21 +185,21 @@ ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr
#####################################################
# > deltacast
#####################################################
-cp -r VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
-ln -s VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/deltacast_sdk
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-pushd VideoMasterHD_*/Library/
-for i in $(ls -d */x64/)
-do
- pushd $i
- env libdir=%{_libdir} %makeinstall
- popd
-done
-popd
-
-# fix bad arch binaries
-find ${RPM_BUILD_ROOT}/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r {} \;
+#cp -r VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
+#ln -s VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/deltacast_sdk
+#
+#mkdir -p $RPM_BUILD_ROOT%{_libdir}
+#pushd VideoMasterHD_*/Library/
+#for i in $(ls -d */x64/)
+#do
+# pushd $i
+# env libdir=%{_libdir} %makeinstall
+# popd
+#done
+#popd
+#
+## fix bad arch binaries
+#find ${RPM_BUILD_ROOT}/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r {} \;
#####################################################
# < deltacast
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/debian.rules b/ultragrid-proprietary-drivers-1.4/debian.rules
--- a/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:15.106053106 +0100
@@ -68,14 +68,14 @@ override_dh_auto_install:
#####################################################
# > deltacast
#####################################################
- cp -r VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
- ln -s VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk
-
- #deltacast
- mkdir -p $(DEB_BUILD_ROOT)/usr/lib
- cd VideoMasterHD_*/Library/ ; for i in $$(ls -d */x64/); do pushd $$i ; echo $$i ; make install libdir=$(DEB_BUILD_ROOT)/usr/lib ; popd ; done
-
- find $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r '{}' \;
+# cp -r VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
+# ln -s VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk
+#
+# #deltacast
+# mkdir -p $(DEB_BUILD_ROOT)/usr/lib
+# cd VideoMasterHD_*/Library/ ; for i in $$(ls -d */x64/); do pushd $$i ; echo $$i ; make install libdir=$(DEB_BUILD_ROOT)/usr/lib ; popd ; done
+#
+# find $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r '{}' \;
#####################################################
# < deltacast
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec
--- a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:15.006051365 +0100
@@ -34,8 +34,8 @@ Source1: ultragrid-proprietary-drivers-1
#####################################################
# > deltacast (videoMasterHD)
#####################################################
-Patch0: videoMasterHD-destdir.patch
-Patch1: videoMasterHD-linux4.6-get-user-pages.patch
+#Patch0: videoMasterHD-destdir.patch
+#Patch1: videoMasterHD-linux4.6-get-user-pages.patch
#####################################################
# < deltacast (videoMasterHD)
#####################################################
@@ -82,8 +82,8 @@ VideoMasterHD --deltacast
#####################################################
# > deltacast
#####################################################
-%patch0 -p1
-%patch1 -p1
+#%%patch0 -p1
+#%%patch1 -p1
#####################################################
# < deltacast
#####################################################
@@ -186,21 +186,21 @@ ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr
#####################################################
# > deltacast
#####################################################

View File

@@ -1,6 +1,6 @@
diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
--- a/ultragrid/debian.rules 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/debian.rules 2017-05-19 15:14:29.644840311 +0200
--- a/ultragrid/debian.rules 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/debian.rules 2017-12-15 17:07:15.658062716 +0100
@@ -21,7 +21,7 @@ CARDCONF_BLUEFISH=--enable-bluefish444 -
#####################################################
# > dvs
@@ -11,8 +11,8 @@ diff -rupN a/ultragrid/debian.rules b/ultragrid/debian.rules
# < dvs
#####################################################
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:29.596840150 +0200
--- a/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:14.686045796 +0100
+++ b/ultragrid/ultragrid.spec.tpl 2017-12-15 17:07:15.606061809 +0100
@@ -108,7 +108,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > dvs
@@ -23,8 +23,8 @@ diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
# < dvs
#####################################################
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:29.572840070 +0200
--- a/ultragrid-nightly/debian.rules 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/debian.rules 2017-12-15 17:07:15.586061461 +0100
@@ -21,7 +21,7 @@ CARDCONF_BLUEFISH=--enable-bluefish444 -
#####################################################
# > dvs
@@ -35,8 +35,8 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
# < 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-05-19 15:14:28.688837109 +0200
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:29.524839910 +0200
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:14.682045726 +0100
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-12-15 17:07:15.546060765 +0100
@@ -108,7 +108,7 @@ UltraGrid developed by Colin Perkins, La
#####################################################
# > dvs
@@ -47,8 +47,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ul
# < dvs
#####################################################
diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules
--- a/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:29.812840874 +0200
--- a/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-12-15 17:07:15.802065222 +0100
@@ -50,10 +50,10 @@ override_dh_auto_install:
#####################################################
# > dvs
@@ -65,9 +65,9 @@ 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-05-19 15:14:28.712837189 +0200
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-05-19 15:14:29.672840405 +0200
@@ -61,7 +61,7 @@ Patch25: AJA-linux4.6-get-user-pages.pat
--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:14.690045865 +0100
+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-12-15 17:07:15.682063132 +0100
@@ -63,7 +63,7 @@ Patch25: AJA-linux4.6-get-user-pages.pat
#####################################################
# > dvs (sdk)
#####################################################
@@ -76,7 +76,7 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < dvs (sdk)
#####################################################
@@ -109,7 +109,7 @@ VideoMasterHD --deltacast
@@ -111,7 +111,7 @@ VideoMasterHD --deltacast
#####################################################
# > dvs (sdk)
#####################################################
@@ -85,7 +85,61 @@ diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/
#####################################################
# < dvs (sdk)
#####################################################
@@ -165,10 +165,10 @@ popd
@@ -167,10 +167,10 @@ popd
#####################################################
# > dvs
#####################################################
-cp -r sdk4.3.* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
-ln -s sdk4.3* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk
-
-rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk/linux-x86
+#cp -r sdk4.3.* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
+#ln -s sdk4.3* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk
+#
+#rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk/linux-x86
#####################################################
# < dvs
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/debian.rules b/ultragrid-proprietary-drivers-1.4/debian.rules
--- a/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/debian.rules 2017-12-15 17:07:15.950067797 +0100
@@ -50,10 +50,10 @@ override_dh_auto_install:
#####################################################
# > dvs
#####################################################
- cp -r sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
- ln -s sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk
-
- rm -r $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk/linux-x86
+# cp -r sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
+# ln -s sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk
+#
+# rm -r $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk/linux-x86
#####################################################
# < dvs
#####################################################
diff -rupN a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec
--- a/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:14.694045934 +0100
+++ b/ultragrid-proprietary-drivers-1.4/ultragrid-proprietary-drivers-1.4.spec 2017-12-15 17:07:15.830065708 +0100
@@ -64,7 +64,7 @@ Patch25: AJA-linux4.6-get-user-pages.pat
#####################################################
# > dvs (sdk)
#####################################################
-Patch30: dvs-linux4.6-get-user-pages.patch
+#Patch30: dvs-linux4.6-get-user-pages.patch
#####################################################
# < dvs (sdk)
#####################################################
@@ -112,7 +112,7 @@ VideoMasterHD --deltacast
#####################################################
# > dvs (sdk)
#####################################################
-%patch30 -p1
+#%%patch30 -p1
#####################################################
# < dvs (sdk)
#####################################################
@@ -168,10 +168,10 @@ popd
#####################################################
# > dvs
#####################################################

View File

@@ -0,0 +1,13 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/classes/ntv2utils.h b/ntv2sdklinux_12.4.2.1/ntv2projects/classes/ntv2utils.h
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/classes/ntv2utils.h 2016-10-29 13:46:43.784790745 +0200
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/classes/ntv2utils.h 2016-10-29 14:37:25.756878939 +0200
@@ -631,7 +631,8 @@ typedef struct NTV2FormatDescriptor
ULWord linePitch; ///< @brief Number of 32-bit words per line
ULWord firstActiveLine; ///< @brief First active line of video (0 if vanc not enabled)
- explicit inline NTV2FormatDescriptor () : numLines (0), numPixels (0), linePitch (0), firstActiveLine (0) {} ///< @brief My default constructor
+ /** gcc-6 does not allow to call explicit default constructor calls in array initializations (see ntv2util.cpp:213 */
+ inline NTV2FormatDescriptor () : numLines (0), numPixels (0), linePitch (0), firstActiveLine (0) {} ///< @brief My default constructor
/**
@brief Construct from line and pixel count, plus line pitch.

View File

@@ -0,0 +1,44 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/ntv2driverdma.c b/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/ntv2driverdma.c
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/ntv2driverdma.c 2016-10-28 10:24:00.508000000 +0200
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/ntv2driverdma.c 2017-03-03 09:46:07.148690755 +0100
@@ -2797,12 +2797,16 @@ ntv2_sgl_map_user_pages(struct page **pa
down_read(&current->mm->mmap_sem);
/* rw==READ means read from drive, write into memory area */
res = get_user_pages(
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
current,
current->mm,
+#endif
uaddr,
nr_pages,
rw == READ, // DMA engines ignore permissions
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
0, /* don't force */
+#endif
pages,
NULL);
up_read(&current->mm->mmap_sem);
@@ -2910,7 +2914,11 @@ ntv2_sgl_map_user_pages(struct page **pa
out_unmap:
if (res > 0) {
for (j=0; j < res; j++)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(pages[j]);
+#else
+ put_page(pages[j]);
+#endif
}
return res;
}
@@ -2928,7 +2936,11 @@ static int ntv2_sgl_unmap_user_pages(str
/* FIXME: cache flush missing for rw==READ
* FIXME: call the correct reference counting function
*/
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(pages[i]);
+#else
+ put_page(pages[i]);
+#endif
}
return 0;

View File

@@ -0,0 +1,69 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/classes/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/classes/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/classes/Makefile 2016-10-28 08:24:00.688000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/classes/Makefile 2016-10-28 08:26:00.996000000 +0000
@@ -17,7 +17,7 @@ else
AJA_LIBNAME = libaja
-KERNEL_INCLUDES := /lib/modules/$(shell uname -r)/build
+KERNEL_INCLUDES := /lib/modules/$(shell ls -1 /lib/modules | sort | head -n 1)/build
PYTHON_DEV := /usr/include/python2.4
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk 2016-10-28 08:24:00.504000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk 2016-10-28 08:27:53.656000000 +0000
@@ -57,7 +57,7 @@ AC_SUBST(FL_API_VERSION)
dnl Get the operating system and version number...
uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
+uversion=`ls -1 /lib/modules | sort | head -n 1 | sed -e '1,$s/[[^0-9]]//g'`
if test "x$uname" = xIRIX64; then
uname="IRIX"
fi
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure b/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure 2016-10-28 08:24:00.516000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure 2016-10-28 08:30:16.320000000 +0000
@@ -1461,7 +1461,7 @@ cat <<_ASUNAME
hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -r = `(ls -1 /lib/modules | sort | head -n 1) 2>/dev/null || echo unknown`
uname -s = `(uname -s) 2>/dev/null || echo unknown`
uname -v = `(uname -v) 2>/dev/null || echo unknown`
@@ -1813,7 +1813,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
+uversion=`ls -1 /lib/modules | sort | head -n 1 | sed -e '1,$s/[^0-9]//g'`
if test "x$uname" = xIRIX64; then
uname="IRIX"
fi
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure.in b/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure.in
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure.in 2016-10-28 08:24:00.616000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/fltk/configure.in 2016-10-28 08:31:15.256000000 +0000
@@ -57,7 +57,7 @@ AC_SUBST(FL_API_VERSION)
dnl Get the operating system and version number...
uname=`uname`
-uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
+uversion=`ls -1 /lib/modules | sort | head -n 1 | sed -e '1,$s/[[^0-9]]//g'`
if test "x$uname" = xIRIX64; then
uname="IRIX"
fi
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/Makefile 2016-10-28 08:24:00.508000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/driver/linuxdriver/Makefile 2016-10-28 08:32:06.072000000 +0000
@@ -7,7 +7,7 @@
PWD = $(shell pwd)
DRIVERDIR ?= $(PWD)
NTV2_ROOT ?= $(DRIVERDIR)/../../
-KDIR ?= /lib/modules/$(shell uname -r)/build
+KDIR ?= /lib/modules/$(shell ls -1 /lib/modules | sort | head -n 1)/build
include $(NTV2_ROOT)/configure.mk
include $(NTV2_ROOT)/sdkversion.mk

View File

@@ -0,0 +1,12 @@
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/Makefile 2016-10-28 08:24:00.504000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/Makefile 2016-10-28 09:52:23.176000000 +0000
@@ -26,8 +26,8 @@ include configure.mk
SUBDIRS = classes \
$(DRIVER_DIR) \
commonapps \
- demoapps \
linuxapps
+# demoapps \
include internal.mk
include sdkversion.mk

View File

@@ -0,0 +1,72 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/qthevcmon/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/qthevcmon/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/qthevcmon/Makefile 2016-10-28 10:10:47.880000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/qthevcmon/Makefile 2016-10-28 09:59:37.824000000 +0000
@@ -10,7 +10,7 @@ NTV2_ROOT := $(shell pwd)/../..
QT_PRO_FILE = qthevcmon.pro
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt4
include $(NTV2_ROOT)/qt.mk
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk 2016-10-28 10:11:03.048000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.in.ntv2.fltk 2016-10-28 08:27:53.656000000 +0000
@@ -57,7 +57,7 @@ AC_SUBST(FL_API_VERSION)
dnl Get the operating system and version number...
uname=`uname`
-uversion=`ls -1 /lib/modules | sort | head -n 1 | sed -e '1,$s/[[^0-9]]//g'`
+uversion=`ls -1 /lib/modules | sort | head -n 1 | sed -e '1,$s/[^0-9]//g'`
if test "x$uname" = xIRIX64; then
uname="IRIX"
fi
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.mk b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.mk
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/configure.mk 2016-10-28 10:10:47.848000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/configure.mk 2016-10-28 09:58:29.384000000 +0000
@@ -115,7 +115,7 @@ export X11LIBDIR
# setup the QT Dirs
ifeq ($(QTDIR),)
- QTDIR := $(dir $(lastword $(shell qmake -v 2>&1)))
+ QTDIR := $(dir $(lastword $(shell qmake-qt4 -v 2>&1)))
ifeq ($(QTDIR),)
$(warning QTDIR environment variable not set, skipping applications that require Qt. Try installing the appropriate Qt package.)
endif
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtmultiinput/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtmultiinput/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtmultiinput/Makefile 2016-10-28 10:10:47.852000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtmultiinput/Makefile 2016-10-28 09:59:37.820000000 +0000
@@ -22,7 +22,7 @@ export AJA_APP_BINDIR
QT_PRO_FILE = ntv2qtmultiinput.pro
QT_QRC_FILE = ntv2qtmultiinput.qrc
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt4
include ../../qt.mk
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtpreview/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtpreview/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtpreview/Makefile 2016-10-28 10:10:47.852000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtpreview/Makefile 2016-10-28 09:59:37.820000000 +0000
@@ -11,7 +11,7 @@ NTV2_ROOT := $(shell pwd)/../..
QT_PRO_FILE = ntv2qtpreview.pro
QT_QRC_FILE = ntv2qtpreview.qrc
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt4
include $(NTV2_ROOT)/qt.mk
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtrawcapture/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtrawcapture/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtrawcapture/Makefile 2016-10-28 10:10:47.868000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/demoapps/ntv2qtrawcapture/Makefile 2016-10-28 09:59:37.824000000 +0000
@@ -11,7 +11,7 @@ NTV2_ROOT := $(shell pwd)/../..
QT_PRO_FILE = ntv2qtrawcapture.pro
QT_QRC_FILE = ntv2qtrawcapture.qrc
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt4
include ../../qt.mk

View File

@@ -0,0 +1,13 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile 2016-10-28 10:10:47.888000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile 2016-10-28 09:59:37.824000000 +0000
@@ -12,7 +12,7 @@ TARGET := ntv2watcher
QT_PRO_FILE = $(TARGET).pro
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt5
.PHONY: clean

View File

@@ -0,0 +1,25 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile 2016-10-28 10:10:47.888000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/Makefile 2016-10-28 09:59:37.824000000 +0000
@@ -12,7 +12,7 @@ TARGET := ntv2watcher
QT_PRO_FILE = $(TARGET).pro
QMAKE_FILE = qMakefile
-QMAKE ?= qmake
+QMAKE ?= qmake-qt5
.PHONY: clean
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/qt.mk b/ntv2sdklinux_12.4.2.1/ntv2projects/qt.mk
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/qt.mk 2016-10-28 10:10:47.896000000 +0000
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/qt.mk 2016-10-28 10:01:57.472000000 +0000
@@ -10,7 +10,7 @@
# so make sure that we do that.
# WTF? qmake -v outputs to stderr??
-QMAKE_V := $(shell qmake -v 2>&1)
+QMAKE_V := $(shell qmake-qt5 -v 2>&1)
QMAKE_4 := $(findstring 4.,$(QMAKE_V))
QMAKE_5 := $(findstring 5.,$(QMAKE_V))

View File

@@ -0,0 +1,24 @@
diff -rupN a/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driverdma.c b/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driverdma.c
--- a/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driverdma.c 2015-03-25 13:34:04.000000000 +0100
+++ b/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driverdma.c 2016-04-27 21:50:41.034105019 +0200
@@ -25,7 +25,7 @@
#include <asm/semaphore.h>
#endif
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/pci.h>
#include <linux/bootmem.h>
#include <linux/sched.h>
diff -rupN a/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driver.h b/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driver.h
--- a/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driver.h 2015-03-25 13:34:04.000000000 +0100
+++ b/ntv2linux-12.3.7.34/ntv2projects/linuxdriver/ntv2driver.h 2016-04-27 16:07:24.406906932 +0200
@@ -17,7 +17,7 @@
#ifndef NTV2_DRIVER_HEADER
#define NTV2_DRIVER_HEADER
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
// Some kernel version sensitive macro-rama
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)

View File

@@ -0,0 +1,14 @@
diff -rupN a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/watchermain.cpp b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/watchermain.cpp
--- a/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/watchermain.cpp 2016-10-28 10:24:00.496000000 +0200
+++ b/ntv2sdklinux_12.4.2.1/ntv2projects/commonapps/ntv2watcher/watchermain.cpp 2016-11-10 11:48:54.187356863 +0100
@@ -48,8 +48,8 @@ NTV2Watcher::NTV2Watcher(QWidget *parent
timer = new QTimer(this);
connect(timer, &QTimer::timeout, this, &NTV2Watcher::slot_pollDevice);
- QStyleHints * qsh = qApp->styleHints();
- qsh->setStartDragTime(100);
+ //QStyleHints * qsh = qApp->styleHints();
+ qApp->setStartDragTime(100);
connect (widgetList, &WidgetList::addRegister, this, &NTV2Watcher::slot_addRegister, Qt::QueuedConnection);
connect (widgetList, &WidgetList::detachWidget, this, &NTV2Watcher::slot_detachWidget, Qt::QueuedConnection);

View File

@@ -0,0 +1,9 @@
This driver suite expects a source tarball, named drivers.tar.gz.
Its content has to match (with respect to vendors enabled) following structure:
# ls -1 ultragrid-proprietary-drivers-20170103/
EpochLinuxDriver_V5_11_0_19
ntv2sdklinux_12.4.2.1
sdk4.3.5.21
VideoMasterHD_SDK_Linux_v5.21

View File

@@ -0,0 +1,25 @@
<services>
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://github.com/CESNET/UltraGrid.git</param>
<param name="version">1.3</param>
<param name="revision">nightly</param>
<param name="filename">ultragrid-git</param>
<param name="package-meta">yes</param>
<param name="submodules">enable</param>
</service>
<service name="extract_file">
<param name="archive">*ultragrid*.tar</param>
<param name="files">*/package_specs/ultragrid-proprietary-drivers-1.4/*</param>
</service>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">localhost</param>
<param name="path">path-to-drivers-archive.tar</param>
<param name="filename">drivers.tar</param>
</service>
<service name="recompress">
<param name="file">*drivers.tar</param>
<param name="compression">gz</param>
</service>
</services>

View File

@@ -0,0 +1,114 @@
#!/bin/bash
function err_exit(){
printf "%s\n" "$2"
exit $1
}
function usage(){
printf "%s drivers.tar 4.9.2 opensuse-422\n" "$0"
printf "\tdrivers.tar\tpath to tarball with proprietary code\n"
printf "\t4.9.2\t\ttarget kernel version to backport patches onto\n"
printf "\topensuse-422\tAppend tag to patch name\n"
}
function backport_patch(){
local doi="$4"
local tag=$3
local kver=$2
local inpatch="$1"
local outpatch="$(echo "$inpatch" | sed -r 's#[.]patch$#-$tag.patch#g')"
# patches on input are sorted, b was reset before call
local kver_MAJOR="$(echo "$kver" | cut -d'.' -f1)"
local kver_MINOR="$(echo "$kver" | cut -d'.' -f2)"
local kver_RELEASE="$(echo "$kver" | cut -d'.' -f3)"
#[[ "x$inpatch" != "xbackport" ]] && patch -p1 <"$inpatch"
# scan loop
local matchver='KERNEL_VERSION[[:space:]]*[(][[:space:]]*([0-9]+)[[:space:]]*,[[:space:]]*([0-9]+)[[:space:]]*,[[:space:]]*([0-9]+)[[:space:]]*[)]'
local matchexpr='#if.*\bLINUX_VERSION_CODE\b.*\b('"$matchver"').*'
grep -HorE "$matchexpr" "$doi" | dos2unix | while read -d$'\n' -r KVER ; do
local KVER_BASE="$(echo "$KVER" | cut -d: -f2)"
local KVER_MAJOR="$(echo "$KVER_BASE" | sed -r "s#^.*$matchver.*\$#\1#g")"
local KVER_MINOR="$(echo "$KVER_BASE" | sed -r "s#^.*$matchver.*\$#\2#g")"
local KVER_RELEASE="$(echo "$KVER_BASE" | sed -r "s#^.*$matchver.*\$#\3#g")"
[[ "$KVER_MAJOR" -lt "$kver_MAJOR" ]] && continue
([[ "$KVER_MAJOR" = "$kver_MAJOR" ]] && [[ "$KVER_MINOR" -lt "$kver_MINOR" ]]) && continue
([[ "$KVER_MAJOR" = "$kver_MAJOR" ]] && [[ "$KVER_MINOR" = "$kver_MINOR" ]] && [[ "$KVER_RELEASE" -lt "$kver_RELEASE" ]]) && continue
sed -i '-e' "s#$(echo "$KVER" | grep -oE "$matchver")#KERNEL_VERSION($kver_MAJOR,$kver_MINOR,$kver_RELEASE)#g" "$(echo "$KVER" | cut -d':' -f1)"
done
# end of replace, generate patch
}
scriptroot="$(dirname "$(realpath "$0")")"
drivers="$1"
tokernel="$2"
patchtag="$3"
for arg; do
[[ "x$arg" = "x-h" ]] && (usage "$0" ; exit 1)
done
[[ "x$drivers" = "x" ]] && err_exit 1 "Need tarball with proprietary drivers to extract"
[[ "x$tokernel" = "x" ]] && err_exit 1 "Need target kernel version"
[[ "x$patchtag" = "x" ]] && err_exit 1 "Need patch tagname"
vendors=( deltacast blackmagick dvs AJA bluefish cuda )
subdirs=( /dev/null '*ideoMaster*' 'sdk*' 'ntv2sdk*' 'Epoch*' /dev/null )
mkdir -p backport_tmp
rm -rf a
echo -n "extracting drivers ..."
tar -C backport_tmp -xf "$drivers"
echo " [done]"
mv backport_tmp/ultragrid-proprietary-drivers* a
rm -rf backport_tmp
for i in $(seq 0 $((${#vendors[@]}-1))) ; do
vendor=${vendors[$i]}
vendir="${subdirs[$i]}"
[[ "x$vendir" = "x/dev/null" ]] && continue
vendir="$(echo "a/"$vendir)"
echo "processing $vendor dir $vendir"
[[ -d "$vendir" ]] || continue
cp -r a a.$vendor
patchconv=$((ls -1 "../$vendor"-linux[0-9]*.patch "../${subdirs[$i]}"-linux[0-9]*.patch 2>/dev/null | sort -n | head -n 1 | cut -d- -f1 ; echo "$vendor" ) | head -n 1)
pushd a.$vendor > /dev/null
for patch in $(ls -1 "../$vendor"-linux[0-9]*.patch "../${subdirs[$i]}"-linux[0-9]*.patch |& sort -n) ; do
[[ ! -f "$patch" ]] && continue
patch -p1 <"$patch"
done
popd > /dev/null
printf "\tpatches applied (if any)\n"
cp -r a.$vendor b.$vendor
pushd b.$vendor > /dev/null
backport_patch "backport" "$tokernel" "$patchtag" "$(basename "$vendir")"
popd > /dev/null
outpatch="$patchconv-kernel-backports-$patchtag.patch"
diff -rupN a.$vendor b.$vendor > "$outpatch"
sed -i -r -e "s#\bb.$vendor\b/#b/#g" -e "s#\ba.$vendor\b/#a/#g" "$outpatch"
[[ -s "$outpatch" ]] || rm "$outpatch"
rm -r b.$vendor
rm -r a.$vendor
done
rm -r a

View File

@@ -0,0 +1,175 @@
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile 2016-11-16 22:45:12.917115721 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile 2016-11-16 22:49:23.145473987 +0100
@@ -5,20 +5,16 @@ BLUE_RELEASE_DIR=../../release/driver
CPP=g++
SRC = CC_EIA708B_Parser.cpp EmbAudioUtil.cpp HDVancUtil.cpp BlueHancFrame.cpp
CFLAGS = -Wall -fpic -g -I/usr/include -I. -I$(BLUE_RELEASE_DIR)/inc
+DESTDIR ?= /
+libdir ?= /usr/lib
BLUE_MACHINE_ARCH=$(shell uname -m)
ifeq ($(BLUE_MACHINE_ARCH) ,x86_64)
TARGET=libBlueANCUtils64.so
-ifeq ($(shell if test -d "/usr/lib64/"; then echo yes; fi),yes)
-SYSTEM_LIB_DIR=lib64
-else
-SYSTEM_LIB_DIR=lib
-endif
CFLAGS += -m64
else
TARGET=libBlueANCUtils.so
-SYSTEM_LIB_DIR=lib
endif
OBJS = $(TARGET)
@@ -30,12 +26,13 @@ $(SRC:.cpp=.o):
$(TARGET): $(SRC:.cpp=.o)
$(CPP) -g -shared -Wl,-soname,$(TARGET) -o $(TARGET) $^ -lc
install: all
- -cp -f $(TARGET) /usr/$(SYSTEM_LIB_DIR)/$(TARGET)
+ mkdir -p $(DESTDIR)$(libdir)
+ -cp -f $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
-cp $(TARGET) $(BLUE_RELEASE_DIR)/lib
-cp BlueHancUtils.h $(BLUE_RELEASE_DIR)/inc
-cp BlueHancFrame.h $(BLUE_RELEASE_DIR)/inc
-cp BlueHANC.h $(BLUE_RELEASE_DIR)/inc
- -cp $(TARGET) /usr/$(SYSTEM_LIB_DIR)/
+ -cp $(TARGET) $(DESTDIR)$(libdir)/
clean:
rm -f *.o
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile 2016-11-16 22:45:12.917115721 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile 2016-11-16 22:50:22.850501636 +0100
@@ -5,6 +5,8 @@ OBJS = $(TARGET)
SRC = BlueVelvet_i.cpp BlueVelvet_Audio.cpp BlueVelvet_VideoOut.cpp BlueVelvet_Dma.cpp BlueVelvet_VideoIn.cpp BlueVelvet4_i.cpp BlueAudioConvert.cpp CardIORouting.cpp DeviceInterface.cpp AudioPlaybackDevice.cpp
#CFLAGS = -Wall -fpic -g -I/usr/include -I. -I../Inc
CFLAGS = -Wall -O3 -fpic -g -I/usr/include -I. -I$(BLUE_RELEASE_DIR)/inc -Wno-unused
+DESTDIR ?= /
+libdir ?= /usr/lib
BLUE_MACHINE_ARCH=$(shell uname -m)
@@ -13,11 +15,6 @@ TARGET=libBlueVelvet64.so
TARGET_GPUDIRECT=$(BLUE_RELEASE_DIR)/lib/libdvp64.so
TARGET_BLUEGPUDIRECT=$(BLUE_RELEASE_DIR)/lib/libBlueGpuDirect64.so
EPOCH_SCALER_COEFF_LIB=EpochScalerCoeff64
-ifeq ($(shell if test -d "/usr/lib64/"; then echo yes; fi),yes)
-SYSTEM_LIB_DIR=lib64
-else
-SYSTEM_LIB_DIR=lib
-endif
CFLAGS += -m64
endif
@@ -29,9 +26,10 @@ $(SRC:.cpp=.o):
$(TARGET): $(SRC:.cpp=.o)
$(CPP) -g -shared -Wl,-soname,$(TARGET) -o $(TARGET) $^ -lc -L. -l$(EPOCH_SCALER_COEFF_LIB)
install: all
- - cp -f $(TARGET) /usr/$(SYSTEM_LIB_DIR)/$(TARGET)
- - cp -f $(TARGET_GPUDIRECT) /usr/$(SYSTEM_LIB_DIR)/
- - cp -f $(TARGET_BLUEGPUDIRECT) /usr/$(SYSTEM_LIB_DIR)/
+ mkdir -p $(DESTDIR)$(libdir)
+ - cp -f $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+ - cp -f $(TARGET_GPUDIRECT) $(DESTDIR)$(libdir)/
+ - cp -f $(TARGET_BLUEGPUDIRECT) $(DESTDIR)$(libdir)/
- cp -f $(TARGET) $(BLUE_RELEASE_DIR)/lib/
cp -f BlueVelvet_c.h $(BLUE_RELEASE_DIR)/inc
cp -f BlueVelvet.h $(BLUE_RELEASE_DIR)/inc
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile 2016-11-16 22:45:12.917115721 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile 2016-11-16 22:51:03.715201566 +0100
@@ -5,20 +5,16 @@ BLUE_RELEASE_DIR=../../../release/driver
CPP=g++
SRC = BlueVelvetC_i.cpp ../BlueUtils.cpp ../BlueVelvetCUtils.cpp ../BlueVelvetCHancUtils.cpp
CFLAGS = -Wall -fpic -g -I/usr/include -I. -I$(BLUE_RELEASE_DIR)/inc -DBLUE_LINUX_CODE
+DESTDIR ?= /
+libdir ?= /usr/lib
BLUE_MACHINE_ARCH=$(shell uname -m)
ifeq ($(BLUE_MACHINE_ARCH) ,x86_64)
TARGET=libBlueVelvetC64.so
-ifeq ($(shell if test -d "/usr/lib64/"; then echo yes; fi),yes)
-SYSTEM_LIB_DIR=lib64
-else
-SYSTEM_LIB_DIR=lib
-endif
CFLAGS += -m64
else
TARGET=libBlueVelvetC.so
-SYSTEM_LIB_DIR=lib
endif
OBJS = $(TARGET)
@@ -30,12 +26,13 @@ $(SRC:.cpp=.o):
$(TARGET): $(SRC:.cpp=.o)
$(CPP) -g -shared -Wl,-soname,$(TARGET) -o $(TARGET) $^ -lc
install: all
- -cp -f $(TARGET) /usr/$(SYSTEM_LIB_DIR)/$(TARGET)
+ mkdir -p $(DESTDIR)$(libdir)
+ -cp -f $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
-cp $(TARGET) $(BLUE_RELEASE_DIR)/lib
-cp ../BlueVelvetC.h $(BLUE_RELEASE_DIR)/inc
-cp ../BlueVelvetCUtils.h $(BLUE_RELEASE_DIR)/inc
-cp ../BlueVelvetCDefines.h $(BLUE_RELEASE_DIR)/inc
- -cp $(TARGET) /usr/$(SYSTEM_LIB_DIR)/
+ -cp $(TARGET) $(DESTDIR)$(libdir)/
clean:
rm -f *.o
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/AVCaptureApp/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/AVCaptureApp/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/AVCaptureApp/Makefile 2016-03-18 05:36:07.000000000 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/AVCaptureApp/Makefile 2016-11-16 22:52:12.688383131 +0100
@@ -6,15 +6,15 @@ OBJS = $(TARGET)
SRC = BlueUtils.cpp BlueAVSource.cpp BlueVideoSourceFifo.cpp BlueFishCard.cpp AppMain.cpp
SDK_DIR=../../../release/driver
CFLAGS = -Wall -O3 -fpic -g -I/usr/include -I. -I$(SDK_DIR)/inc
+DESTDIR ?= /
+libdir ?= /usr/lib
BLUE_MACHINE_ARCH=$(shell uname -m)
ifeq ($(BLUE_MACHINE_ARCH) ,x86_64)
-SYSTEM_LIB_DIR=lib64
CFLAGS += -m64
BLUE_HANC_LIB=-lBlueANCUtils64
else
-SYSTEM_LIB_DIR=lib
BLUE_HANC_LIB=-lBlueANCUtils
endif
@@ -25,7 +25,8 @@ $(SRC:.cpp=.o):
$(TARGET): $(SRC:.cpp=.o)
$(CPP) -g -shared -Wl,-soname,$(TARGET) -o $(TARGET) $^ -lBlueVelvet64
- cp $(TARGET) /usr/$(SYSTEM_LIB_DIR)/
+ mkdir -p $(DESTDIR)$(libdir)
+ cp $(TARGET) $(DESTDIR)$(libdir)/
$(TARGET_APP): $(SRC:.cpp=.o)
$(CPP) -o $(TARGET_APP) $^ -lBlueVelvet64 -L$(SDK_DIR)/lib/ $(Cpp) $(CFLAGS) -I$(SDK_DIR)/inc -L$(SDK_DIR)/lib/ -L/usr/local/lib -L/usr/lib/nvidia-current/ -lpthread $(BLUE_HANC_LIB) -lGL -lGLU -lglut -lGLEW
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile 2016-11-16 22:45:12.917115721 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile 2016-11-16 22:53:02.873242988 +0100
@@ -6,6 +6,8 @@ CC = g++
CFLAGS = -g
OPENGLLIB=-lGL -lGLU -lglut -lGLEW
SRC = BlueTeaPotGenerator.cpp BluePlaybackHardware.cpp BlueCaptureHardware.cpp shader.cpp
+DESTDIR ?= /
+libdir ?= /usr/lib
BLUE_MACHINE_ARCH=$(shell uname -m)
ifeq ($(BLUE_MACHINE_ARCH) ,x86_64)
@@ -14,9 +16,7 @@ BLUE_HANC_LIB=-lBlueANCUtils64
else
ifeq ($(BLUE_MACHINE_ARCH) ,ppc64)
CFLAGS += -m64
-BLUE_LIB_DIR=lib64
else
-BLUE_LIB_DIR=lib
BLUE_HANC_LIB=-lBlueANCUtils
endif
endif

View File

@@ -0,0 +1,55 @@
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile 2016-10-31 10:41:08.664766807 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueHancUtils/Makefile 2016-10-31 10:47:53.964781764 +0100
@@ -2,7 +2,7 @@
BLUE_RELEASE_DIR=../../release/driver
-CPP=gcc
+CPP=g++
SRC = CC_EIA708B_Parser.cpp EmbAudioUtil.cpp HDVancUtil.cpp BlueHancFrame.cpp
CFLAGS = -Wall -fpic -g -I/usr/include -I. -I$(BLUE_RELEASE_DIR)/inc
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile 2016-10-31 10:41:08.668766808 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvet/Makefile 2016-10-31 10:47:53.968781765 +0100
@@ -1,6 +1,6 @@
#!/bin/sh -x
BLUE_RELEASE_DIR=../../release/driver
-CPP=gcc
+CPP=g++
OBJS = $(TARGET)
SRC = BlueVelvet_i.cpp BlueVelvet_Audio.cpp BlueVelvet_VideoOut.cpp BlueVelvet_Dma.cpp BlueVelvet_VideoIn.cpp BlueVelvet4_i.cpp BlueAudioConvert.cpp CardIORouting.cpp DeviceInterface.cpp AudioPlaybackDevice.cpp
#CFLAGS = -Wall -fpic -g -I/usr/include -I. -I../Inc
diff -rupN a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile 2016-10-31 10:41:08.664766807 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/apis/BlueVelvetC/lin/Makefile 2016-10-31 10:47:53.964781764 +0100
@@ -2,7 +2,7 @@
BLUE_RELEASE_DIR=../../../release/driver
-CPP=gcc
+CPP=g++
SRC = BlueVelvetC_i.cpp ../BlueUtils.cpp ../BlueVelvetCUtils.cpp ../BlueVelvetCHancUtils.cpp
CFLAGS = -Wall -fpic -g -I/usr/include -I. -I$(BLUE_RELEASE_DIR)/inc -DBLUE_LINUX_CODE
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile 2016-10-31 10:41:08.540766803 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/GLTeapot/Makefile 2016-10-31 10:47:53.956781762 +0100
@@ -1,5 +1,5 @@
TARGET=BlueTeaPotGenerator
-CPP=gcc
+CPP=g++
OBJS = $(TARGET)
CC = g++
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/Playback4K_FS/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/Playback4K_FS/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/Playback4K_FS/Makefile 2016-10-31 10:41:08.576766804 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/PlaybackVideo/Playback4K_FS/Makefile 2016-10-31 10:47:53.960781764 +0100
@@ -1,5 +1,5 @@
TARGET=Playback4K_FS
-CPP=gcc
+CPP=g++
OBJS = $(TARGET)
CC = g++

View File

@@ -0,0 +1,22 @@
diff -rupN a/EpochLinuxDriver_V5_11_0_19/drivers/orac/OracDMABufferMap.c b/EpochLinuxDriver_V5_11_0_19/drivers/orac/OracDMABufferMap.c
--- a/EpochLinuxDriver_V5_11_0_19/drivers/orac/OracDMABufferMap.c 2017-02-11 13:39:17.390475532 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/drivers/orac/OracDMABufferMap.c 2017-02-11 15:36:01.748721014 +0100
@@ -1,5 +1,6 @@
#include "OracDriver.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
#include "OracDMAUtil.h"
#include <linux/time.h>
#define DMA_DEBUG
@@ -257,7 +258,11 @@ void bluedma_unmap_userbuffer(struct blu
(dma_buffer->dmaDirection == DMA_WRITE)?PCI_DMA_TODEVICE:PCI_DMA_FROMDEVICE);
for (i=0; i < dma_buffer->nr_pages; i++)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(dma_buffer->pages[i]);
+#else
+ put_page(dma_buffer->pages[i]);
+#endif
blue_clear_User_DMA_Request(&dma_buffer->userIrp);
dma_buffer->buf = NULL;
dma_buffer->buffer_map_type= BlueFishDMA_PermMapped;

View File

@@ -0,0 +1,84 @@
diff -rupN a/EpochLinuxDriver_V5_11_0_19/applications/Makefile b/EpochLinuxDriver_V5_11_0_19/applications/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/applications/Makefile 2016-10-31 10:41:08.496766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/applications/Makefile 2016-10-31 10:44:38.000774517 +0100
@@ -2,7 +2,7 @@ OBJS = $(TARGET).o
CC = g++
SDK_DIR =../release/driver
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)
diff -rupN a/EpochLinuxDriver_V5_11_0_19/drivers/orac/Makefile b/EpochLinuxDriver_V5_11_0_19/drivers/orac/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/drivers/orac/Makefile 2016-10-31 10:41:08.676766808 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/drivers/orac/Makefile 2016-10-31 10:44:38.012774518 +0100
@@ -35,7 +35,7 @@ obj ?= .
PWD := $(shell pwd)
MODULE_OBJECT := $(MODULE_NAME).ko
-KERNEL_UNAME := $(shell uname -r)
+KERNEL_UNAME := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNEL_SOURCES := /lib/modules/$(KERNEL_UNAME)/build/
EXTRA_CFLAGS += -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE -DNTRM -D_GNU_SOURCE -D_LOOSE_KERNEL_NAMES -D__KERNEL__ -DMODULE -DUSE_NEW_VIDEO_FIFO
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/CaptureAncillary/ReadClosedCaptions/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/CaptureAncillary/ReadClosedCaptions/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/CaptureAncillary/ReadClosedCaptions/Makefile 2016-10-31 10:41:08.500766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/CaptureAncillary/ReadClosedCaptions/Makefile 2016-10-31 10:44:38.000774517 +0100
@@ -2,7 +2,7 @@ OBJS = $(TARGET).o
CC = g++
SDK_DIR =../../../release/driver
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoDevices/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoDevices/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoDevices/Makefile 2016-10-31 10:41:08.536766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoDevices/Makefile 2016-10-31 10:44:38.008774518 +0100
@@ -1,7 +1,7 @@
OBJS = $(TARGET).o
CC = gcc
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoModes/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoModes/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoModes/Makefile 2016-10-31 10:41:08.536766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/CaptureVideo/V4L2/EnumVideoModes/Makefile 2016-10-31 10:44:38.008774518 +0100
@@ -1,7 +1,7 @@
OBJS = $(TARGET).o
CC = gcc
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/Duplex/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/Duplex/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/Duplex/Makefile 2016-10-31 10:41:08.500766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/Duplex/Makefile 2016-10-31 10:44:38.004774517 +0100
@@ -2,7 +2,7 @@ OBJS = $(TARGET).o
CC = g++
SDK_DIR=../../release/driver
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)
diff -rupN a/EpochLinuxDriver_V5_11_0_19/samples/misc/Makefile b/EpochLinuxDriver_V5_11_0_19/samples/misc/Makefile
--- a/EpochLinuxDriver_V5_11_0_19/samples/misc/Makefile 2016-10-31 10:41:08.536766802 +0100
+++ b/EpochLinuxDriver_V5_11_0_19/samples/misc/Makefile 2016-10-31 10:44:38.008774518 +0100
@@ -2,7 +2,7 @@ OBJS = $(TARGET).o
CC = g++
SDK_DIR =../../release/driver
-LINUX_KERNEL_VERSION := $(shell uname -r)
+LINUX_KERNEL_VERSION := $(shell ls -1 /lib/modules | sort | head -n 1)
KERNELDIR := /lib/modules/$(LINUX_KERNEL_VERSION)/build
BLUE_MACHINE_ARCH=$(shell uname -m)

View File

@@ -0,0 +1,7 @@
videoMasterHD-destdir.patch
bluefish-uname.patch
bluefish-g++.patch
bluefish-destdir.patch
AJA-linuxdriver-uname.patch
AJA-nodemo.patch
AJA-setStartDragTime.patch

View File

@@ -0,0 +1,7 @@
videoMasterHD-destdir.patch
bluefish-uname.patch
bluefish-g++.patch
bluefish-destdir.patch
AJA-linuxdriver-uname.patch
AJA-nodemo.patch
#AJA-qt5.patch

View File

@@ -0,0 +1,11 @@
videoMasterHD-destdir.patch
videoMasterHD-linux4.6-get-user-pages.patch
bluefish-uname.patch
bluefish-g++.patch
bluefish-destdir.patch
bluefish-linux4.6-get-user-pages.patch
AJA-linuxdriver-uname.patch
AJA-nodemo.patch
AJA-gcc-explicit-constructors.patch
AJA-linux4.6-get-user-pages.patch
dvs-linux4.6-get-user-pages.patch

View File

@@ -0,0 +1,86 @@
#!/usr/bin/make -f
SHELL=/bin/bash
DEB_BUILD_ROOT=$(shell realpath . )/debian/tmp
%:
dh $@
override_dh_auto_configure:
echo "no configure here"
override_dh_shlibdeps:
env LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu:/usr/lib dh_shlibdeps -Xusr/src/ultragrid-externals
# -- --ignore-missing-info
override_dh_auto_build:
#####################################################
# > aja
#####################################################
cd ntv2sdklinux*/ntv2projects ; make QTDIR=/usr/lib/qt5
#####################################################
# < aja
#####################################################
#####################################################
# > bluefish
#####################################################
cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make
cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make
#####################################################
# < bluefish
#####################################################
# relativize all symlinks (build phase), variant for old realpath (without --relative-to)
find ./ -type l -print0 | xargs -0 -I '{}' sh -c 'mv "{}" "{}.pkgbkp" ; ln -s "$$(realpath "{}.pkgbkp" | sed -r -e "s#^$(shell realpath . )/##g" -e "s#(([^/]{2,})|([^./]))#..#g")/$$(realpath "$$(readlink "{}.pkgbkp")" | sed -r "s#^$(shell realpath . )/##g")" "{}" ; rm "{}.pkgbkp"'
override_dh_auto_install:
# zbytek
mkdir -p $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
#####################################################
# > bluefish
#####################################################
cp -r EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
ln -s EpochLinuxDriver_V5* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/bluefish_sdk
cd EpochLinuxDriver_V5*/drivers/orac ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
cd EpochLinuxDriver_V5*/apis/BlueVelvet ; env libdir=/usr/lib make install DESTDIR=$(DEB_BUILD_ROOT)
#####################################################
# < bluefish
#####################################################
#####################################################
# > dvs
#####################################################
cp -r sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
ln -s sdk4.3* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk
rm -r $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/dvs_sdk/linux-x86
#####################################################
# < dvs
#####################################################
#####################################################
# > aja
#####################################################
cp -r ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
ln -s ntv2sdklinux* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/aja_sdk
#####################################################
# < aja
#####################################################
#####################################################
# > deltacast
#####################################################
cp -r VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/
ln -s VideoMasterHD_* $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk
#deltacast
mkdir -p $(DEB_BUILD_ROOT)/usr/lib
cd VideoMasterHD_*/Library/ ; for i in $$(ls -d */x64/); do pushd $$i ; echo $$i ; make install libdir=$(DEB_BUILD_ROOT)/usr/lib ; popd ; done
find $(DEB_BUILD_ROOT)/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r '{}' \;
#####################################################
# < deltacast
#####################################################
for pattern in "*.so" "*.so.*" "*.sh" ; do find $(DEB_BUILD_ROOT)/ -name "$$pattern" -exec chmod +x "{}" \; ; done
for pattern in "*.cpp" "*.h" Makefile "*.bin" "*.pdf" ; do find $(DEB_BUILD_ROOT)/ -name "$$pattern" -exec chmod -x "{}" \; ; done

View File

@@ -0,0 +1,58 @@
diff -rupN a/sdk4.3.5.21/development/src_lucy/driver/linux.c b/sdk4.3.5.21/development/src_lucy/driver/linux.c
--- a/sdk4.3.5.21/development/src_lucy/driver/linux.c 2016-05-13 02:25:39.000000000 +0200
+++ b/sdk4.3.5.21/development/src_lucy/driver/linux.c 2017-03-03 09:47:00.253642795 +0100
@@ -790,7 +790,13 @@ INTERNAL donttag ps_alenlist * hal_LockM
/*** make all pages present */
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
result = get_user_pages(current, current->mm, (unsigned long) addr, npages, bcard2host, 0 /* force */, pages, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ result = get_user_pages((unsigned long) addr, npages, bcard2host, 0 /* force */, pages, NULL);
+#else
+ result = get_user_pages((unsigned long) addr, npages, bcard2host, pages, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (result != npages) {
DPF_WARN("hal_LockMemory: get_user_pages failed (%d)\n", result);
@@ -907,7 +913,11 @@ INTERNAL donttag void hal_UnlockMemory(v
if (alenlist->flags & PS_ALENLIST_READ) {
SetPageDirty(pages[i]);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(pages[i]);
+#else
+ put_page(pages[i]);
+#endif
}
}
diff -rupN a/sdk4.3.5.21/development/src_v4r3/driver/linux.c b/sdk4.3.5.21/development/src_v4r3/driver/linux.c
--- a/sdk4.3.5.21/development/src_v4r3/driver/linux.c 2016-05-13 02:25:39.000000000 +0200
+++ b/sdk4.3.5.21/development/src_v4r3/driver/linux.c 2017-03-03 09:47:51.082554472 +0100
@@ -806,7 +806,13 @@ INTERNAL donttag ps_alenlist * hal_LockM
/*** make all pages present */
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
result = get_user_pages(current, current->mm, (unsigned long) addr, npages, bcard2host, 0 /* force */, pages, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ result = get_user_pages((unsigned long) addr, npages, bcard2host, 0 /* force */, pages, NULL);
+#else
+ result = get_user_pages((unsigned long) addr, npages, bcard2host, pages, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (result != npages) {
DPF_WARN("hal_LockMemory: get_user_pages failed (%d)\n", result);
@@ -924,7 +930,11 @@ INTERNAL donttag void hal_UnlockMemory(v
if (alenlist->flags & PS_ALENLIST_READ) {
SetPageDirty(pages[i]);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(pages[i]);
+#else
+ put_page(pages[i]);
+#endif
}
}

View File

@@ -0,0 +1,12 @@
# see https://en.opensuse.org/openSUSE:Build_Service_Debian_builds#packageName.dsc
DEBTRANSFORM-TAR: drivers.tar.gz
DEBTRANSFORM-FILES-TAR: debian.tar.gz
DEBTRANSFORM-SERIES: debian-patches-Ubuntu_1404.series
Format: 1.0
Source: ultragrid-proprietary-drivers
Binary: ultragrid-proprietary-drivers-1.4
Architecture: any
Version: 20161027
Standards-Version: 3.9.6
Maintainer: Matej Minarik <xminari4@fi.muni.cz>
Build-Depends: debhelper (>= 7.0.50~), build-essential, linux-headers-generic, realpath, coreutils, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libglew-dev, libxext-dev, linux-libc-dev, libncurses5-dev, qtchooser, qt5-default, qtmultimedia5-dev

View File

@@ -0,0 +1,12 @@
# see https://en.opensuse.org/openSUSE:Build_Service_Debian_builds#packageName.dsc
DEBTRANSFORM-TAR: drivers.tar.gz
DEBTRANSFORM-FILES-TAR: debian.tar.gz
DEBTRANSFORM-SERIES: debian-patches-Ubuntu_1504.series
Format: 1.0
Source: ultragrid-proprietary-drivers
Binary: ultragrid-proprietary-drivers-1.4
Architecture: any
Standards-Version: 3.9.6
Version: 20161027
Maintainer: Matej Minarik <xminari4@fi.muni.cz>
Build-Depends: debhelper (>= 7.0.50~), build-essential, linux-headers-generic, realpath, coreutils, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libglew-dev, libxext-dev, linux-libc-dev, libncurses5-dev, qtchooser, qt5-default, qtmultimedia5-dev

View File

@@ -0,0 +1,12 @@
# see https://en.opensuse.org/openSUSE:Build_Service_Debian_builds#packageName.dsc
DEBTRANSFORM-TAR: drivers.tar.gz
DEBTRANSFORM-FILES-TAR: debian.tar.gz
DEBTRANSFORM-SERIES: debian-patches-Ubuntu_1504.series
Format: 1.0
Source: ultragrid-proprietary-drivers
Binary: ultragrid-proprietary-drivers-1.4
Architecture: any
Standards-Version: 3.9.6
Version: 20161027
Maintainer: Matej Minarik <xminari4@fi.muni.cz>
Build-Depends: debhelper (>= 7.0.50~), build-essential, linux-headers-generic, realpath, coreutils, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libglew-dev, libxext-dev, linux-libc-dev, libncurses5-dev, qtchooser, qt5-default, qtmultimedia5-dev

View File

@@ -0,0 +1,14 @@
addFilter("ultragrid-proprietary-drivers-1.4.* devel-file-in-non-devel-package")
addFilter("ultragrid-proprietary-drivers-1.4.* file-contains-date-and-time")
addFilter("ultragrid-proprietary-drivers-1.4.* wrong-script-end-of-line-encoding")
addFilter("ultragrid-proprietary-drivers-1.4.* files-duplicate")
addFilter("ultragrid-proprietary-drivers-1.4.* binary-or-shlib-calls-gethostbyname")
addFilter("ultragrid-proprietary-drivers-1.4.* executable-stack")
addFilter("ultragrid-proprietary-drivers-1.4.* no-soname")
addFilter("ultragrid-proprietary-drivers-1.4.* hidden-file-or-dir")
addFilter("ultragrid-proprietary-drivers-1.4.* incorrect-fsf-address")
addFilter("ultragrid-proprietary-drivers-1.4.* zero-length")
addFilter("ultragrid-proprietary-drivers-1.4.* shared-lib-calls-exit")
addFilter("ultragrid-proprietary-drivers-1.4.* shlib-policy-missing-suffix")
addFilter("ultragrid-proprietary-drivers-1.4.* version-control-internal-file")
addFilter("ultragrid-proprietary-drivers-1.4.* no-rpm-opt-flags")

View File

@@ -0,0 +1,12 @@
# see https://en.opensuse.org/openSUSE:Build_Service_Debian_builds#packageName.dsc
DEBTRANSFORM-TAR: drivers.tar.gz
DEBTRANSFORM-FILES-TAR: debian.tar.gz
DEBTRANSFORM-SERIES: debian-patches-series
Format: 1.0
Source: ultragrid-proprietary-drivers
Binary: ultragrid-proprietary-drivers-1.4
Architecture: any
Version: 20161027
Standards-Version: 3.9.6
Maintainer: Matej Minarik <xminari4@fi.muni.cz>
Build-Depends: debhelper (>= 7.0.50~), build-essential, linux-headers, realpath, coreutils, autoconf, automake, libx11-dev, libgl1-mesa-dev, libglu1-mesa-dev, libglew-dev, libxext-dev, linux-libc-dev, libncurses5-dev, qtchooser, qt5-default, qtmultimedia5-dev

View File

@@ -0,0 +1,233 @@
Name: ultragrid-proprietary-drivers-1.4
Version: 20170103
Release: 1%{?dist}
Summary: Ultragrid drivers pseudometapackage
Group: Applications/Multimedia
License: GPL
URL: http://ultragrid.cz
Conflicts: ultragrid-proprietary-drivers-release-1.3, ultragrid-proprietary-drivers-release-1.5, ultragrid-proprietary-drivers-nightly
Provides: ultragrid-proprietary-drivers-release-1.4
# replace this line with generated conflicts
BuildRequires: gcc-c++, make, automake, autoconf, coreutils
BuildRequires: libX11-devel, glew-devel, libXext-devel, glibc, ncurses-devel, qt-devel
BuildRequires: %kernel_module_package_buildreqs , kernel
#####################################################
# > blackmagick (DesktopVideo)
#####################################################
Requires: desktopvideo
#####################################################
# < blackmagick (Desktopvideo)
#####################################################
%if 0%{?fedora}
BuildRequires: mesa-libGLU-devel, libgcc, qt5-qtbase-devel, mesa-libGL-devel
%else
BuildRequires: freeglut-devel, libqt5-qtbase-devel
%endif
#BuildArch: x86_64
Source0: drivers.tar.gz
Source1: ultragrid-proprietary-drivers-1.4-rpmlintrc
#####################################################
# > deltacast (videoMasterHD)
#####################################################
Patch0: videoMasterHD-destdir.patch
Patch1: videoMasterHD-linux4.6-get-user-pages.patch
#####################################################
# < deltacast (videoMasterHD)
#####################################################
#####################################################
# > bluefish (EpochLinuxDriver)
#####################################################
Patch10: bluefish-uname.patch
Patch11: bluefish-g++.patch
Patch12: bluefish-destdir.patch
Patch13: bluefish-linux4.6-get-user-pages.patch
#####################################################
# < bluefish (EpochLinuxDriver)
#####################################################
#####################################################
# > aja (ntv2sdklinux)
#####################################################
Patch20: AJA-linuxdriver-uname.patch
Patch21: AJA-nodemo.patch
Patch22: AJA-qmake.patch
Patch23: AJA-qt5.patch
Patch24: AJA-gcc-explicit-constructors.patch
Patch25: AJA-linux4.6-get-user-pages.patch
#####################################################
# < aja (ntv2sdklinux)
#####################################################
#####################################################
# > dvs (sdk)
#####################################################
Patch30: dvs-linux4.6-get-user-pages.patch
#####################################################
# < dvs (sdk)
#####################################################
%description
Proprietary ultragrid drivers that are 3th party.
Drivers currently managed by this specfile:
EpochLinuxDriver_V5 --bluefish
ntv2sdklinux_12.4.2.1 --aja
sdk4.3.5.21 --dvs
VideoMasterHD --deltacast
%prep
%setup -q
#####################################################
# > deltacast
#####################################################
%patch0 -p1
%patch1 -p1
#####################################################
# < deltacast
#####################################################
#####################################################
# > bluefish
#####################################################
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
#####################################################
# < bluefish
#####################################################
#####################################################
# > aja
#####################################################
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
#####################################################
# < aja
#####################################################
#####################################################
# > dvs (sdk)
#####################################################
%patch30 -p1
#####################################################
# < dvs (sdk)
#####################################################
%build
%define debug_package %{nil}
#####################################################
# > aja
#####################################################
ls
pushd ntv2sdklinux_*/ntv2projects
env libdir=%{_libdir} make QTDIR=/usr/lib/qt5
popd
#####################################################
# < aja
#####################################################
#####################################################
# > bluefish
#####################################################
pushd EpochLinuxDriver_V5*/drivers/orac
env libdir=%{_libdir} make
popd
pushd EpochLinuxDriver_V5*/apis/BlueVelvet
env libdir=%{_libdir} make
popd
#####################################################
# < bluefish
#####################################################
# relativize all symlinks (build phase)
find ./ -type l -print0 | xargs -0 -I '{}' sh -c 'mv "{}" "{}.pkgbkp" ; ln -s "$(realpath --relative-to="{}.pkgbkp" "$(readlink "{}.pkgbkp")")" "{}" ; rm "{}.pkgbkp"'
%install
mkdir -p $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
#####################################################
# > bluefish
#####################################################
cp -r EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
ln -s EpochLinuxDriver_V5* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/bluefish_sdk
pushd EpochLinuxDriver_V5*/drivers/orac
env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
popd
pushd EpochLinuxDriver_V5*/apis/BlueVelvet
env libdir=%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
popd
#####################################################
# < bluefish
#####################################################
#####################################################
# > dvs
#####################################################
cp -r sdk4.3.* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
ln -s sdk4.3* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk
rm -r $RPM_BUILD_ROOT/usr/src/ultragrid-externals/dvs_sdk/linux-x86
#####################################################
# < dvs
#####################################################
#####################################################
# > aja
#####################################################
cp -r ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
ln -s ntv2sdklinux_* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/aja_sdk
#####################################################
# < aja
#####################################################
#####################################################
# > deltacast
#####################################################
cp -r VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/
ln -s VideoMasterHD* $RPM_BUILD_ROOT/usr/src/ultragrid-externals/deltacast_sdk
mkdir -p $RPM_BUILD_ROOT%{_libdir}
pushd VideoMasterHD_*/Library/
for i in $(ls -d */x64/)
do
pushd $i
env libdir=%{_libdir} %makeinstall
popd
done
popd
# fix bad arch binaries
find ${RPM_BUILD_ROOT}/usr/src/ultragrid-externals/deltacast_sdk/Library/ -maxdepth 2 -name x86 -exec rm -r {} \;
#####################################################
# < deltacast
#####################################################
for pattern in "*.so" "*.so.*" "*.sh" ; do find ${RPM_BUILD_ROOT}/ -name "$pattern" -exec chmod +x {} \; ; done
for pattern in "*.cpp" "*.h" Makefile "*.bin" "*.pdf" ; do find ${RPM_BUILD_ROOT}/ -name "$pattern" -exec chmod -x {} \; ; done
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/*
%{_prefix}/src/ultragrid-externals
%changelog
* Tue Jan 3 2017 Lukas Rucka <xrucka@fi.muni.cz>
- 20170103
- Marked up sections to enable public specification release available
* Fri Oct 28 2016 Lukas Rucka <xrucka@fi.muni.cz>
- 20161022
- Upgraded all drivers
* Fri Apr 29 2016 Lukas Rucka <xrucka@fi.muni.cz>
- Upgraded VideoMasterHD & ntv2
* Tue Mar 17 2015 Matej Minarik <xminari4@mail.muni.cz>
- Creating this package

View File

@@ -0,0 +1,202 @@
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x64/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x64/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x64/Makefile 2016-07-29 12:52:24.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x64/Makefile 2016-11-10 12:35:45.260626366 +0100
@@ -1,13 +1,15 @@
#################################
# VideoMasterHD
#################################
-
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
- cp libvideomasterhd.so.1.0.1 /usr/lib
- /sbin/ldconfig
- ln -sf /usr/lib/libvideomasterhd.so.1 /usr/lib/libvideomasterhd.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd.so.1.0.1 $(DESTDIR)$(libdir)
+ ln -sf libvideomasterhd.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd.so.1
+ ln -sf libvideomasterhd.so.1 $(DESTDIR)$(libdir)/libvideomasterhd.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x86/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x86/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x86/Makefile 2016-07-29 12:45:18.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD/x86/Makefile 2016-11-10 12:36:08.509034544 +0100
@@ -5,18 +5,13 @@
#################################
# Setup common variables
#################################
-
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-TARGET_DIR := lib32
-else
-TARGET_DIR := lib
-endif
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
-
- cp libvideomasterhd.so.1.0.1 /usr/$(TARGET_DIR)/libvideomasterhd.so.1.0.1
- /sbin/ldconfig
- ln -sf /usr/$(TARGET_DIR)/libvideomasterhd.so.1 /usr/$(TARGET_DIR)/libvideomasterhd.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd.so.1.0.1
+ ln -sf libvideomasterhd.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd.so.1
+ ln -sf libvideomasterhd.so.1 $(DESTDIR)$(libdir)/libvideomasterhd.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x64/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x64/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x64/Makefile 2016-07-29 12:52:32.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x64/Makefile 2016-11-10 12:36:33.357470804 +0100
@@ -1,11 +1,13 @@
#################################
# VideoMasterHD_Audio
#################################
-
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
- cp libvideomasterhd_audio.so.1.0.1 /usr/lib
- /sbin/ldconfig
- ln -sf /usr/lib/libvideomasterhd_audio.so.1 /usr/lib/libvideomasterhd_audio.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_audio.so.1.0.1 $(DESTDIR)$(libdir)
+ ln -sf libvideomasterhd_audio.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_audio.so.1
+ ln -sf libvideomasterhd_audio.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_audio.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x86/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x86/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x86/Makefile 2016-07-29 12:45:28.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Audio/x86/Makefile 2016-11-10 12:36:53.389822505 +0100
@@ -5,18 +5,13 @@
#################################
# Setup common variables
#################################
-
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-TARGET_DIR := lib32
-else
-TARGET_DIR := lib
-endif
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
-
- cp libvideomasterhd_audio.so.1.0.1 /usr/$(TARGET_DIR)/libvideomasterhd_audio.so.1.0.1
- /sbin/ldconfig
- ln -sf /usr/$(TARGET_DIR)/libvideomasterhd_audio.so.1 /usr/$(TARGET_DIR)/libvideomasterhd_audio.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_audio.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_audio.so.1.0.1
+ ln -sf libvideomasterhd_audio.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_audio.so.1
+ ln -sf libvideomasterhd_audio.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_audio.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x64/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x64/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x64/Makefile 2016-07-29 12:52:32.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x64/Makefile 2016-11-10 12:37:03.966008184 +0100
@@ -1,12 +1,15 @@
#################################
# VideoMasterHD_Vbi
#################################
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
- cp libvideomasterhd_vbi.so.1.0.1 /usr/lib
- /sbin/ldconfig
- ln -sf /usr/lib/libvideomasterhd_vbi.so.1 /usr/lib/libvideomasterhd_vbi.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_vbi.so.1.0.1 $(DESTDIR)$(libdir)
+ ln -sf libvideomasterhd_vbi.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbi.so.1
+ ln -sf libvideomasterhd_vbi.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbi.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x86/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x86/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x86/Makefile 2016-07-29 12:45:28.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_Vbi/x86/Makefile 2016-11-10 12:37:22.462332910 +0100
@@ -5,19 +5,14 @@
#################################
# Setup common variables
#################################
-
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-TARGET_DIR := lib32
-else
-TARGET_DIR := lib
-endif
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
-
- cp libvideomasterhd_vbi.so.1.0.1 /usr/$(TARGET_DIR)/libvideomasterhd_vbi.so.1.0.1
- /sbin/ldconfig
- ln -sf /usr/$(TARGET_DIR)/libvideomasterhd_vbi.so.1 /usr/$(TARGET_DIR)/libvideomasterhd_vbi.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_vbi.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbi.so.1.0.1
+ ln -sf libvideomasterhd_vbi.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbi.so.1
+ ln -sf libvideomasterhd_vbi.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbi.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x64/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x64/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x64/Makefile 2016-07-29 12:52:34.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x64/Makefile 2016-11-10 12:37:34.846550326 +0100
@@ -1,12 +1,14 @@
#################################
# VideoMasterHD_Vbi
#################################
-
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
- cp libvideomasterhd_vbidata.so.1.0.1 /usr/lib
- /sbin/ldconfig
- ln -sf /usr/lib/libvideomasterhd_vbidata.so.1 /usr/lib/libvideomasterhd_vbidata.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_vbidata.so.1.0.1 $(DESTDIR)$(libdir)
+ ln -sf libvideomasterhd_vbidata.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbidata.so.1
+ ln -sf libvideomasterhd_vbidata.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbidata.so
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x86/Makefile b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x86/Makefile
--- a/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x86/Makefile 2016-07-29 12:45:30.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Library/VideoMasterHD_VbiData/x86/Makefile 2016-11-10 12:37:57.434946882 +0100
@@ -5,19 +5,14 @@
#################################
# Setup common variables
#################################
-
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-TARGET_DIR := lib32
-else
-TARGET_DIR := lib
-endif
+DESTDIR ?= /
+libdir ?= /usr/lib
default:
install:
-
- cp libvideomasterhd_vbidata.so.1.0.1 /usr/$(TARGET_DIR)/libvideomasterhd_vbidata.so.1.0.1
- /sbin/ldconfig
- ln -sf /usr/$(TARGET_DIR)/libvideomasterhd_vbidata.so.1 /usr/$(TARGET_DIR)/libvideomasterhd_vbidata.so
+ mkdir -p $(DESTDIR)$(libdir)
+ cp libvideomasterhd_vbidata.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbidata.so.1.0.1
+ ln -sf libvideomasterhd_vbidata.so.1.0.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbidata.so.1
+ ln -sf libvideomasterhd_vbidata.so.1 $(DESTDIR)$(libdir)/libvideomasterhd_vbidata.so

View File

@@ -0,0 +1,296 @@
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x64/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x64/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x64/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x64/USBufMngr_Linux.c 2017-03-03 09:39:57.538082583 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x86/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x86/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x86/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/ASI/x86/USBufMngr_Linux.c 2017-03-03 09:43:25.957804435 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x64/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x64/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x64/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x64/USBufMngr_Linux.c 2017-03-03 09:43:25.957804435 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x86/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x86/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x86/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/DVI/x86/USBufMngr_Linux.c 2017-03-03 09:43:25.957804435 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x64/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x64/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x64/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x64/USBufMngr_Linux.c 2017-03-03 09:43:25.961804506 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x86/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x86/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x86/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/HD/x86/USBufMngr_Linux.c 2017-03-03 09:43:25.961804506 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x64/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x64/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x64/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x64/USBufMngr_Linux.c 2017-03-03 09:43:25.961804506 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);
diff -rupN a/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x86/USBufMngr_Linux.c b/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x86/USBufMngr_Linux.c
--- a/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x86/USBufMngr_Linux.c 2016-07-29 14:05:12.000000000 +0200
+++ b/VideoMasterHD_SDK_Linux_v5.21/Drivers/X300/x86/USBufMngr_Linux.c 2017-03-03 09:43:25.965804578 +0100
@@ -15,6 +15,7 @@
#include "KernelObjects.h"
#include "SkelIoctls.h"
#include <linux/pagemap.h>
+#include <linux/version.h>
/***** FUNCTIONS DEFINITION *******************************************************************************************/
@@ -48,7 +49,13 @@ BOOL32 USBufMngr_RetrievePages( PDEVICE_
ppPage_X = (struct page **)pDescr_X->pOSData_v;
down_read(&current->mm->mmap_sem);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
RetVal_i = get_user_pages(current, current->mm, ((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,9,0)
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 1, 0, ppPage_X, NULL);
+#else
+ RetVal_i = get_user_pages(((unsigned long) pUSBufAddr), NbPages_UL, 0, ppPage_X, NULL);
+#endif
up_read(&current->mm->mmap_sem);
if (RetVal_i < 0)
@@ -131,7 +138,11 @@ ULONG i;
if (!PageReserved(ppPage_X[i]))
SetPageDirty(ppPage_X[i]);
else RetailOutput("Page %d is reserverd\n",i);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
page_cache_release(ppPage_X[i]);
+#else
+ put_page(ppPage_X[i]);
+#endif
}
kfree(pDescr_X->pOSData_v);