[Pkg-blender-maintainers] Bug#388349: blender: FTBFS on kfreebsd-i386: unrecognized build system and other problems

[Cyril Brulebois]

Package: blender
Version: 2.42a-1
Severity: important
Tags: patch upstream

Hi,

please find attached some patches to allow blender to build on
kfreebsd-i386. Quick summary:
 - 10_gnukfreebsd_support.dpatch: add support for kFreeBSD, which is not
   known by the build system until now;
 - 20_autotools_outofdate_config.dpatch: update config.{guess,sub} with
   /usr/share/misc/config.* files from autotools-dev;
 - rules_libdc1394_kfreebsd.kibi.diff: little patch for debian/rules so
   that libdc1394 is disabled on kfreebsd without having to maintain
   both linux & kfreebsd user-config.py files.
 - changelog_kfreebsd.kibi.diff: the changelog entry I used to document
   these patches, which you might want to re-use when including them.

Thanks in advance.

Cheers,

-- 
Cyril Brulebois

PS: Since the major part of these patches is upstream, I'm tagging that
bugreport accordingly. Feel free to correct me if I'm wrong.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 10_gnukfreebsd_support.dpatch
Type: application/x-shellscript
Size: 8582 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-blender-maintainers/attachments/20060920/7bd7b086/10_gnukfreebsd_support-0001.bin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20_autotools_outofdate_config.dpatch
Type: application/x-shellscript
Size: 111615 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pkg-blender-maintainers/attachments/20060920/7bd7b086/20_autotools_outofdate_config-0001.bin
-------------- next part --------------
--- blender-2.42a~/debian/rules.orig	2006-09-19 00:08:58.000000000 +0200
+++ blender-2.42a/debian/rules	2006-09-19 00:11:18.000000000 +0200
@@ -23,6 +23,12 @@
 
 	# Add user specific config (without patching)
 	cp $(CURDIR)/debian/misc/user-config.py $(CURDIR)
+
+	# Remove libdc1394 on non-Linux arch
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+	sed -i -e 's/libdc1394//' $(CURDIR)/user-config.py
+endif
+
 	# Add here commands to compile the package.
 	scons WITH_BF_PLAYER=1 WITH_BF_OPENAL=0 BF_FANCY=0
 
-------------- next part --------------
--- blender-2.42a~/debian/changelog	2006-09-20 02:41:40.000000000 +0200
+++ blender-2.42a/debian/changelog	2006-09-20 02:41:56.000000000 +0200
@@ -1,3 +1,18 @@
+blender (2.42a-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add support for GNU/kFreeBSD (kfreebsd-i386 at least):
+    - Add 10_gnukfreebsd_support.dpatch to solve GNU/kFreeBSD detection in
+      SConstruct files and other #define's.
+    - Add 20_autotools_outofdate_config.dpatch because upstreams's
+      config.{guess,sub} are out of date. That patch has been built using
+      config.{guess,sub} from latest autotools-dev (20060702.1)
+    - Conditionalize the removal of "libdc1394" in debian/rules because it is
+      Linux-specific and used unconditionally. Should be more easy to maintain
+      this way than having multiple user-config.py files.
+
+ -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Tue, 19 Sep 2006 00:18:53 +0200
+
 blender (2.42a-1) unstable; urgency=low
 
   [ Wouter van Heyst ]