[SCM] harvid/master: Add patch to fix parallel building (Closes: #804222).

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Sat Nov 7 14:36:28 UTC 2015


The following commit has been merged in the master branch:
commit 17fdcd92887f1b5c18a1d6614ddc3d94d4f1f1f8
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 7 15:21:48 2015 +0100

    Add patch to fix parallel building (Closes: #804222).

diff --git a/debian/patches/0004-fix-parallel-building.patch b/debian/patches/0004-fix-parallel-building.patch
new file mode 100644
index 0000000..a67beca
--- /dev/null
+++ b/debian/patches/0004-fix-parallel-building.patch
@@ -0,0 +1,31 @@
+Description: Fix parallel build
+ libharvid is required to build the harvid binary in the src directory.
+ Declaring this dependency is only possible, when changing the $(SUBDIRS)
+ target from double-colon to single-colon, since double-colon implies
+ independence.
+ But then it has to be marked .PHONY as well, or nothing will be built.
+
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-06>
+Forwarded: robin at gareus.org
+
+--- harvid-0.8.0.orig/Makefile
++++ harvid-0.8.0/Makefile
+@@ -3,7 +3,9 @@ SUBDIRS = libharvid src doc
+ 
+ default: all
+ 
+-$(SUBDIRS)::
++src: libharvid
++
++$(SUBDIRS):
+ 	$(MAKE) -C $@ $(MAKECMDGOALS)
+ 
+ all clean man install uninstall install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib: $(SUBDIRS)
+@@ -11,4 +13,4 @@ all clean man install uninstall install-bin install-man uninstall-bin uninstall-
+ dist:
+ 	git archive --format=tar --prefix=harvid-$(VERSION)/ HEAD | gzip -9 > harvid-$(VERSION).tar.gz
+ 
+-.PHONY: clean all subdirs install uninstall dist install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib
++.PHONY: clean all subdirs install uninstall dist install-bin install-man uninstall-bin uninstall-man install-lib uninstall-lib $(SUBDIRS)
+
diff --git a/debian/patches/series b/debian/patches/series
index f408a9c..80400dd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-spelling.patch
 0003-ffmpeg_2.9.patch
+0004-fix-parallel-building.patch

-- 
harvid packaging



More information about the pkg-multimedia-commits mailing list