mirror of
https://github.com/outbackdingo/UltraGrid.git
synced 2026-03-22 09:40:30 +00:00
053bc15c32
Instead of --enable-bsd there is now --enable-bsd-build and --enable-gpl-build build to indicate that the license relates to UltraGrid build (not components that are linked). That means that in BSD build only BSD-compatible components can be used whether in GPL build also GPL libraries can be linked. + updated package specs to reflect this change
137 lines
6.5 KiB
Diff
137 lines
6.5 KiB
Diff
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
|
|
@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink
|
|
#####################################################
|
|
# > deltacast
|
|
#####################################################
|
|
-CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk
|
|
+#CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk
|
|
#####################################################
|
|
# < deltacast
|
|
#####################################################
|
|
diff -rupN a/ultragrid/ultragrid.spec.tpl b/ultragrid/ultragrid.spec.tpl
|
|
--- a/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.700837150 +0200
|
|
+++ b/ultragrid/ultragrid.spec.tpl 2017-05-19 15:14:28.912837859 +0200
|
|
@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La
|
|
#####################################################
|
|
# > deltacast
|
|
#####################################################
|
|
-%define build_deltacast 1
|
|
+#%%define build_deltacast 1
|
|
#####################################################
|
|
# < deltacast
|
|
#####################################################
|
|
diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules
|
|
--- a/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.688837109 +0200
|
|
+++ b/ultragrid-nightly/debian.rules 2017-05-19 15:14:28.884837766 +0200
|
|
@@ -35,7 +35,7 @@ CARDCONF_DECKLINK= --enable-decklink
|
|
#####################################################
|
|
# > deltacast
|
|
#####################################################
|
|
-CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk
|
|
+#CARDCONF_DELTACAST= --enable-deltacast --with-deltacast=/usr/src/ultragrid-externals/deltacast_sdk
|
|
#####################################################
|
|
# < deltacast
|
|
#####################################################
|
|
diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec.tpl b/ultragrid-nightly/ultragrid-nightly.spec.tpl
|
|
--- a/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:28.688837109 +0200
|
|
+++ b/ultragrid-nightly/ultragrid-nightly.spec.tpl 2017-05-19 15:14:28.820837551 +0200
|
|
@@ -122,7 +122,7 @@ UltraGrid developed by Colin Perkins, La
|
|
#####################################################
|
|
# > deltacast
|
|
#####################################################
|
|
-%define build_deltacast 1
|
|
+#%%define build_deltacast 1
|
|
#####################################################
|
|
# < deltacast
|
|
#####################################################
|
|
diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules
|
|
--- a/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:28.712837189 +0200
|
|
+++ b/ultragrid-proprietary-drivers/debian.rules 2017-05-19 15:14:29.156838676 +0200
|
|
@@ -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/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
|
|
#####################################################
|
|
# > 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)
|
|
#####################################################
|
|
@@ -79,8 +79,8 @@ VideoMasterHD --deltacast
|
|
#####################################################
|
|
# > deltacast
|
|
#####################################################
|
|
-%patch0 -p1
|
|
-%patch1 -p1
|
|
+#%%patch0 -p1
|
|
+#%%patch1 -p1
|
|
#####################################################
|
|
# < deltacast
|
|
#####################################################
|
|
@@ -183,21 +183,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
|
|
#####################################################
|