From 5dd05edbba90b5486bd2fe8a8ac0bb38cc92bbed Mon Sep 17 00:00:00 2001 From: Lukas Rucka <359687@mail.muni.cz> Date: Wed, 5 Apr 2017 23:41:50 +0200 Subject: [PATCH] Packaging: fix permissions on ultragrid modules --- Makefile.in | 2 +- specs/__disable_aja__.patch | 18 +++++++++--------- specs/__disable_blackmagick__.patch | 14 +++++++------- specs/__disable_bluefish__.patch | 18 +++++++++--------- specs/__disable_deltacast__.patch | 18 +++++++++--------- specs/__disable_dvs__.patch | 18 +++++++++--------- specs/ultragrid-nightly/ultragrid-nightly.spec | 18 ++++++++++-------- 7 files changed, 54 insertions(+), 52 deletions(-) diff --git a/Makefile.in b/Makefile.in index 31fabab17..f662a5b13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -546,7 +546,7 @@ install: all if [ -f "$(GUI_TARGET)" ]; then $(INSTALL) -m 755 $(GUI_TARGET) $(DESTDIR)/$(bindir); fi if [ -n "@MODULES@" ]; then\ $(INSTALL) -d -m 755 $(DESTDIR)/$(libdir)/ultragrid;\ - $(INSTALL) -m 644 @MODULES@ $(DESTDIR)/$(libdir)/ultragrid/;\ + $(INSTALL) -m 755 @MODULES@ $(DESTDIR)/$(libdir)/ultragrid/;\ fi $(INSTALL) -d -m 755 $(DESTDIR)/$(uv_datadir) $(INSTALL) -m 755 data/ultragrid-bugreport-collect.sh $(DESTDIR)/$(uv_datadir) diff --git a/specs/__disable_aja__.patch b/specs/__disable_aja__.patch index 0564b991d..7b489f52e 100644 --- a/specs/__disable_aja__.patch +++ b/specs/__disable_aja__.patch @@ -1,6 +1,6 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/debian.rules 2017-02-13 12:00:46.564838888 +0100 +--- a/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-05 23:40:53.725260237 +0200 @@ -34,7 +34,7 @@ CARDCONF+=--enable-deltacast --with-delt ##################################################### # > aja @@ -11,9 +11,9 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules # < aja ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultragrid-nightly.spec ---- a/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:46.604839625 +0100 -@@ -98,7 +98,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:53.901267420 +0200 +@@ -113,7 +113,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > aja ##################################################### @@ -23,8 +23,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultrag # < aja ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:46.732841985 +0100 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:54.601295999 +0200 @@ -18,7 +18,7 @@ override_dh_auto_build: ##################################################### # > aja @@ -46,8 +46,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < aja ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:46.784842943 +0100 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:54.845305961 +0200 @@ -49,12 +49,12 @@ Patch13: bluefish-linux4.6-get-user-page ##################################################### # > aja (ntv2sdklinux) diff --git a/specs/__disable_blackmagick__.patch b/specs/__disable_blackmagick__.patch index 9bb7baad4..7694e0517 100644 --- a/specs/__disable_blackmagick__.patch +++ b/specs/__disable_blackmagick__.patch @@ -1,6 +1,6 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.952827605 +0100 +--- a/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-05 23:40:51.049151058 +0200 @@ -20,7 +20,7 @@ CARDCONF+= --enable-dvs --with-dvs=/usr/ ##################################################### # > blackmagick @@ -11,9 +11,9 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules # < blackmagick ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultragrid-nightly.spec ---- a/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.992828343 +0100 -@@ -84,7 +84,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:51.209157584 +0200 +@@ -99,7 +99,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > blackmagick ##################################################### @@ -23,8 +23,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultrag # < 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-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:46.168831588 +0100 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:51.881184992 +0200 @@ -13,7 +13,7 @@ BuildRequires: %kernel_module_package_bu ##################################################### # > blackmagick (DesktopVideo) diff --git a/specs/__disable_bluefish__.patch b/specs/__disable_bluefish__.patch index 7047ffcec..5fff6152c 100644 --- a/specs/__disable_bluefish__.patch +++ b/specs/__disable_bluefish__.patch @@ -1,6 +1,6 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/debian.rules 2017-02-13 12:00:46.880844713 +0100 +--- a/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-05 23:40:55.249322459 +0200 @@ -6,7 +6,7 @@ DEB_UPSTREAM_URL = https://github.com/CE ##################################################### # > bluefish @@ -11,9 +11,9 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules # < bluefish ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultragrid-nightly.spec ---- a/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:46.924845524 +0100 -@@ -70,7 +70,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:55.429329811 +0200 +@@ -85,7 +85,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > bluefish ##################################################### @@ -23,8 +23,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultrag # < bluefish ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:47.076848326 +0100 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:55.957351376 +0200 @@ -25,8 +25,8 @@ override_dh_auto_build: ##################################################### # > bluefish @@ -54,8 +54,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < bluefish ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:47.124849211 +0100 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:56.165359873 +0200 @@ -39,10 +39,10 @@ Patch1: videoMasterHD-linux4.6-get-user ##################################################### # > bluefish (EpochLinuxDriver) diff --git a/specs/__disable_deltacast__.patch b/specs/__disable_deltacast__.patch index fcdce9b02..1941bb24e 100644 --- a/specs/__disable_deltacast__.patch +++ b/specs/__disable_deltacast__.patch @@ -1,6 +1,6 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.600821116 +0100 +--- a/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.381083057 +0200 @@ -27,7 +27,7 @@ CARDCONF+= --enable-decklink ##################################################### # > deltacast @@ -11,9 +11,9 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules # < deltacast ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultragrid-nightly.spec ---- a/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.664822296 +0100 -@@ -91,7 +91,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.541089578 +0200 +@@ -106,7 +106,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > deltacast ##################################################### @@ -23,8 +23,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultrag # < deltacast ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:45.808824951 +0100 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:50.297120396 +0200 @@ -68,14 +68,14 @@ override_dh_auto_install: ##################################################### # > deltacast @@ -49,8 +49,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < deltacast ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:45.856825836 +0100 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:50.525129692 +0200 @@ -31,8 +31,8 @@ Source1: ultragrid-proprietary-drivers-r ##################################################### # > deltacast (videoMasterHD) diff --git a/specs/__disable_dvs__.patch b/specs/__disable_dvs__.patch index 532387610..dbc047967 100644 --- a/specs/__disable_dvs__.patch +++ b/specs/__disable_dvs__.patch @@ -1,6 +1,6 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules ---- a/ultragrid-nightly/debian.rules 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/debian.rules 2017-02-13 12:00:46.260833283 +0100 +--- a/ultragrid-nightly/debian.rules 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/debian.rules 2017-04-05 23:40:52.349204085 +0200 @@ -13,7 +13,7 @@ CARDCONF+= --enable-bluefish444 --enable ##################################################### # > dvs @@ -11,9 +11,9 @@ diff -rupN a/ultragrid-nightly/debian.rules b/ultragrid-nightly/debian.rules # < dvs ##################################################### diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultragrid-nightly.spec ---- a/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:45.568820527 +0100 -+++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-02-13 12:00:46.300834021 +0100 -@@ -77,7 +77,7 @@ UltraGrid developed by Colin Perkins, La +--- a/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:49.261078166 +0200 ++++ b/ultragrid-nightly/ultragrid-nightly.spec 2017-04-05 23:40:52.561212735 +0200 +@@ -92,7 +92,7 @@ UltraGrid developed by Colin Perkins, La ##################################################### # > dvs ##################################################### @@ -23,8 +23,8 @@ diff -rupN a/ultragrid-nightly/ultragrid-nightly.spec b/ultragrid-nightly/ultrag # < dvs ##################################################### diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary-drivers/debian.rules ---- a/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/debian.rules 2017-02-13 12:00:46.428836380 +0100 +--- a/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/debian.rules 2017-04-05 23:40:53.205239013 +0200 @@ -50,10 +50,10 @@ override_dh_auto_install: ##################################################### # > dvs @@ -41,8 +41,8 @@ diff -rupN a/ultragrid-proprietary-drivers/debian.rules b/ultragrid-proprietary- # < dvs ##################################################### diff -rupN a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec ---- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:45.576820674 +0100 -+++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-02-13 12:00:46.468837118 +0100 +--- a/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:49.285079144 +0200 ++++ b/ultragrid-proprietary-drivers/ultragrid-proprietary-drivers.spec 2017-04-05 23:40:53.373245870 +0200 @@ -61,7 +61,7 @@ Patch25: AJA-linux4.6-get-user-pages.pat ##################################################### # > dvs (sdk) diff --git a/specs/ultragrid-nightly/ultragrid-nightly.spec b/specs/ultragrid-nightly/ultragrid-nightly.spec index b8e133145..6caad751a 100644 --- a/specs/ultragrid-nightly/ultragrid-nightly.spec +++ b/specs/ultragrid-nightly/ultragrid-nightly.spec @@ -70,16 +70,17 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. /^libBlueANCUtils64/d; \ /^libsail\.so/d; \ /^libquanta\.so/d; \ +/^libcudart\.so.*/d; \ '" -#define __find_requires /bin/bash -c "/usr/lib/rpm/find-requires | sed -e '\ -#/^libvideomasterhd/d; \ -#/^libcudart\.so/d; \ -#/^libsail\.so/d; \ -#/^libquanta\.so/d; \ -#/^libnpp\.so/d; \ -#/^librt\.so/d; \ -#'" +%define __find_provides /bin/bash -c "/usr/lib/rpm/find-provides | sed -e '\ +/^libvideomasterhd/d; \ +/^libBlueVelvet/d; \ +/^libBlueANCUtils64/d; \ +/^libsail\.so/d; \ +/^libquanta\.so/d; \ +/^libcudart\.so.*/d; \ +'" ##################################################### # > bluefish @@ -160,6 +161,7 @@ UltraGrid developed by Colin Perkins, Ladan Gharai, et al.. %if 0%{?build_aja} > 0 --with-aja=/usr/src/ultragrid-externals/aja_sdk \ %endif + LDFLAGS="$LDFLAGS -Wl,-rpath=%{UGLIBDIR}" \ # --enable-testcard-extras \ make %{?_smp_mflags}