summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2019-02-24 10:10:00 -0700
committerJohn Stebbins <[email protected]>2019-03-07 13:59:35 -0800
commit3062c4373b234f46b131b1092448946f25160351 (patch)
tree34310b10389613fc3abfe87008976785dfce098b /pkg
parentbdb6e72f41cdf975f75323001a2015f6c14e97a4 (diff)
flatpak: allow building with QSV enabled
Diffstat (limited to 'pkg')
-rw-r--r--pkg/linux/flatpak/fr.handbrake.ghb.json5
-rw-r--r--pkg/linux/module.defs4
-rw-r--r--pkg/linux/module.rules8
3 files changed, 12 insertions, 5 deletions
diff --git a/pkg/linux/flatpak/fr.handbrake.ghb.json b/pkg/linux/flatpak/fr.handbrake.ghb.json
index 8cb5e1453..4df07caed 100644
--- a/pkg/linux/flatpak/fr.handbrake.ghb.json
+++ b/pkg/linux/flatpak/fr.handbrake.ghb.json
@@ -60,7 +60,10 @@
{
"name": "handbrake",
"no-autogen": true,
- "config-opts": ["--flatpak", "--disable-gtk-update-checks"],
+ "config-opts": [
+ "--flatpak",
+ "--disable-gtk-update-checks"
+ ],
"builddir": true,
"post-install": ["install -d /app/extensions"],
"sources": [
diff --git a/pkg/linux/module.defs b/pkg/linux/module.defs
index c3dc20524..954fbd452 100644
--- a/pkg/linux/module.defs
+++ b/pkg/linux/module.defs
@@ -28,6 +28,10 @@ ifneq ($(PGP_ID),)
PGPSIGN = --gpg-sign=$(PGP_ID)
endif
+ifeq (1,$(FEATURE.qsv))
+ FPQSV = -q
+endif
+
ifneq ($(FP_RUNTIME),)
FPRUNTIME = -r $(FP_RUNTIME)
endif
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index e12d00830..11b536c8a 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -63,23 +63,23 @@ $(PKG.rpm.stamp): $(PKG.native.rpm.stamp)
#
$(PKG.gui.flathub.manifest):
$(MKDIR.exe) -p $(PKG.out.flatpak/)
- $(SRC/)scripts/create_flatpak_manifest.py -a "$(HB_URL)" -s "$(HB_SHA256)" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(word 1,$($m.FETCH.url))" -s "$(word 1,$($m.FETCH.sha256))") $(FPRUNTIME) $(PKG.gui.flathub.manifest)
+ $(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(HB_URL)" -s "$(HB_SHA256)" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(word 1,$($m.FETCH.url))" -s "$(word 1,$($m.FETCH.sha256))") $(FPRUNTIME) $(PKG.gui.flathub.manifest)
$(PKG.cli.flathub.manifest):
$(MKDIR.exe) -p $(PKG.out.flatpak/)
- $(SRC/)scripts/create_flatpak_manifest.py -a "$(HB_URL)" -s "$(HB_SHA256)" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(word 1,$($m.FETCH.url))" -s "$(word 1,$($m.FETCH.sha256))") $(FPRUNTIME) $(PKG.cli.flathub.manifest)
+ $(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(HB_URL)" -s "$(HB_SHA256)" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(word 1,$($m.FETCH.url))" -s "$(word 1,$($m.FETCH.sha256))") $(FPRUNTIME) $(PKG.cli.flathub.manifest)
$(PKG.gui.flatpak): GNUmakefile $(PKG.src.tar.bz2)
$(MKDIR.exe) -p $(STAGE.out.flatpak/)
$(MKDIR.exe) -p $(PKG.out.flatpak/)
- $(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.ghb.json
+ $(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.gui.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.ghb.json
flatpak-builder --default-branch=$(PKG.flatpak.branch) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.ghb.json
flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) fr.handbrake.ghb $(PKG.flatpak.branch)
$(PKG.cli.flatpak): GNUmakefile $(PKG.src.tar.bz2)
$(MKDIR.exe) -p $(STAGE.out.flatpak/)
$(MKDIR.exe) -p $(PKG.out.flatpak/)
- $(SRC/)scripts/create_flatpak_manifest.py -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
+ $(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.cli.manifest.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
flatpak-builder --default-branch=$(PKG.flatpak.branch) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(STAGE.out.flatpak/)fr.handbrake.HandBrakeCLI.json
flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) fr.handbrake.HandBrakeCLI $(PKG.flatpak.branch)