[SCM] kdenlive packaging branch, master, updated. 9f550ac28d3e70cb6e0992fdea79b6c2f9777920

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=ffcc9aa

The following commit has been merged in the master branch:
commit ffcc9aa6dc65970aec6ee0c9d7eeb9444c7571d3
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Sun May 15 12:33:38 2011 +0000

    * Allow build on kFreeBSD by adding option NO_JOGSHUTTLE.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk@2906 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 debian/changelog | 6 ++++++
 debian/rules     | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8ebc8fc..270448d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdenlive (0.8-4) UNRELEASED; urgency=low
+
+  * Allow build on kFreeBSD by adding option NO_JOGSHUTTLE.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 15 May 2011 14:32:27 +0200
+
 kdenlive (0.8-3) unstable; urgency=low
 
   * Bump mlt build dependencies to >= 0.7.
diff --git a/debian/rules b/debian/rules
index 4934eb3..bc76653 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,13 +16,19 @@ ifeq ($(NCPUS),0)
 	NCPUS:=1
 endif
 
+EXTRAFLAGS :=
+ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
+	EXTRAFLAGS := -DNO_JOGSHUTTLE=YES
+endif
+
 CMAKE_SYSTEM_PROCESSOR = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	[ -d build ] || mkdir build
-	cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH:BOOL=YES
+	cd build && cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH:BOOL=YES $(EXTRAFLAGS)
 	touch $@
 
 build: build-stamp

-- 
kdenlive packaging