Package: yafaray
Version: 0.1.2+really0.1.2~beta5-2
Severity: normal
User: debian-pyt...@lists.debian.org
Usertags: python3.3
Tags: patch
Yafaray fails to build from source against python3.3, because python3.3
in debian has two include paths instead of one. I bypass upstream
detection and instead use pkg-config as that provides correct include
paths on Debian.
Please consider applying this patch, or solving this build failure in
some other way.
diff -Nru yafaray-0.1.2+really0.1.2~beta5/debian/changelog yafaray-0.1.2+really0.1.2~beta5/debian/changelog
--- yafaray-0.1.2+really0.1.2~beta5/debian/changelog 2012-09-04 09:29:11.000000000 +0000
+++ yafaray-0.1.2+really0.1.2~beta5/debian/changelog 2012-10-24 18:04:36.000000000 +0000
@@ -1,3 +1,10 @@
+yafaray (0.1.2+really0.1.2~beta5-2.1) UNRELEASED; urgency=low
+
+ * Build against default python version only. Use pkg-config to detect
+ python includes, fixes ftbfs against py3.3.
+
+ -- Dmitrijs Ledkovs <dmitrij.led...@ubuntu.com> Wed, 24 Oct 2012 17:13:07 +0100
+
yafaray (0.1.2+really0.1.2~beta5-2build1) quantal; urgency=low
* Rebuild for libtiff5.
diff -Nru yafaray-0.1.2+really0.1.2~beta5/debian/control yafaray-0.1.2+really0.1.2~beta5/debian/control
--- yafaray-0.1.2+really0.1.2~beta5/debian/control 2012-05-28 08:56:25.000000000 +0000
+++ yafaray-0.1.2+really0.1.2~beta5/debian/control 2012-10-24 17:33:58.000000000 +0000
@@ -12,10 +13,10 @@
libpng-dev,
libtiff-dev,
libxml2-dev,
- python3-all-dev,
+ python3-dev,
+ pkg-config,
swig,
zlib1g-dev
-X-Python3-Version: >= 3.2
DM-Upload-Allowed: yes
Standards-Version: 3.9.3
Homepage: http://www.yafaray.org
diff -Nru yafaray-0.1.2+really0.1.2~beta5/debian/patches/fix-ftbfs-py3.3.patch yafaray-0.1.2+really0.1.2~beta5/debian/patches/fix-ftbfs-py3.3.patch
--- yafaray-0.1.2+really0.1.2~beta5/debian/patches/fix-ftbfs-py3.3.patch 1970-01-01 00:00:00.000000000 +0000
+++ yafaray-0.1.2+really0.1.2~beta5/debian/patches/fix-ftbfs-py3.3.patch 2012-10-24 17:30:16.000000000 +0000
@@ -0,0 +1,32 @@
+Description: fix FTBFS against python3.3
+ Use pkg-config look-up which is actually correct. Also see packaging
+ changes to build against the default python3 only, instead of
+ multiple versions. (Doesn't make sense for a Blender plugin anyway).
+Origin: Dmitrijs Ledkovs <x...@ubuntu.com>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: not yet
+Last-Update: 2012-10-24
+--- yafaray-0.1.2+really0.1.2~beta5.orig/src/bindings/CMakeLists.txt
++++ yafaray-0.1.2+really0.1.2~beta5/src/bindings/CMakeLists.txt
+@@ -40,7 +40,7 @@ IF (WITH_YAF_PY_BINDINGS)
+ endif(YAF_PY_VERSION)
+
+ MESSAGE("Searching for Python ${REQUIRED_PYTHON_VERSION}")
+- find_package(YafPythonLibs REQUIRED)
++ pkg_check_modules(PYTHON python-${REQUIRED_PYTHON_VERSION})
+
+ if (NOT PYTHON_LIBRARIES)
+ message("Python wasn't found, please install it to build python bindings")
+@@ -84,8 +84,8 @@ if (WITH_YAF_PY_BINDINGS)
+
+ endif(NOT WIN32)
+
+- message("Python header path: ${PYTHON_INCLUDE_DIR}")
+- include_directories(${YAF_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIR})
++ message("Python header path: ${PYTHON_INCLUDE_DIRS}")
++ include_directories(${YAF_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
+ include(${SWIG_USE_FILE})
+
+ if(YAF_PY_VERSION GREATER 3)
diff -Nru yafaray-0.1.2+really0.1.2~beta5/debian/patches/series yafaray-0.1.2+really0.1.2~beta5/debian/patches/series
--- yafaray-0.1.2+really0.1.2~beta5/debian/patches/series 2012-05-28 08:33:20.000000000 +0000
+++ yafaray-0.1.2+really0.1.2~beta5/debian/patches/series 2012-10-24 17:28:08.000000000 +0000
@@ -1,2 +1,3 @@
0001-Fix_FTBFS_on_ARM.patch
0002-Disable_FAST_MATH.patch
+fix-ftbfs-py3.3.patch
diff -Nru yafaray-0.1.2+really0.1.2~beta5/debian/rules yafaray-0.1.2+really0.1.2~beta5/debian/rules
--- yafaray-0.1.2+really0.1.2~beta5/debian/rules 2012-01-09 12:02:53.000000000 +0000
+++ yafaray-0.1.2+really0.1.2~beta5/debian/rules 2012-10-24 17:25:32.000000000 +0000
@@ -2,7 +2,7 @@
export DH_OPTIONS
INSTDIR=debian/tmp
-PY3VERS=$(shell py3versions -drv debian/control)
+PY3VERS=$(shell py3versions -dv)
%:
dh $@ --buildsystem=cmake --builddirectory=build --with python3
@@ -22,5 +22,3 @@
dh_install
cp -rf $(INSTDIR)/$(CURDIR)/bindings/python/* \
debian/yafaray/usr/lib/yafaray
-
-override_dh_pysupport:
Regards,
Dmitrijs.
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
