[needs-merge] blender_2.45-3

Could somebody else take a look at this? (Feature Freeze is in 2 days)

As everyone involved with blender packaging might have noticed,
I haven't had any time in the last months (too much else to do).

Hey Lukas!

Here is my merge debdiff. Hopefully it makes it in before freeze.

It is giving me compiling errors in some src/blender/python stuff :(

Any help?

Luis de Bethencourt

I think thats related to debian/patches/50_debian_build_config:

-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '2.4'

Just remove that part of the patch, and it builds successfully.

Also it looks like some build dependencies are missing (libopenal-dev, libalut-dev),
not sure though, as I am just building it on my workstation here (7.10 / Gutsy).

Looks like it can be just synced?!

The only change from us which hasn't been taken by Debian/upstream is 30_gameengine-libgl-location-fix.dpatch, which does:
- libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
+ libGL = dlopen("libGL.so.1", RTLD_LAZY|RTLD_GLOBAL);

I think it can be dropped, too, since /usr/lib/libGL.so appears to be a symlink to libGL.so.1.

The patch is from you, Lukas, so can you comment, please? :) (I could not find a bug reference or a comment in the patch)

I've requested a sync in bug 191955.

Hey Daniel,

Actually I wouldn't simply sync it.
We probably want to use blender with python 2.5, and the current Debian version is still 2.4.

Thanks for finding that patch of mine, seems I forgot to submit that one to the Debian guys.
It actually is quite useful, because libGL.so is only existent if you have the -dev version of the library installed.

Also, as far as I know, dlopen should always be used with the complete SONAME. Otherwise,
if the library changes SONAME, it just breaks silently.

This bug was fixed in the package blender - 2.45-3ubuntu1

---------------
blender (2.45-3ubuntu1) hardy; urgency=low

  * Merge from Debian unstable (LP: #191130), remaining changes:
    - Add 30_gameengine-libgl-location-fix.dpatch: use correct libGL SONAME,
      otherwise blender will not start if e.g. libgl1-mesa-dev is missing
    - debian/control
      + Build-depends: python2.5-dev instead of 2.4
      + DebianMaintainerField
  * Changed debian/patches/50_debian_build_config to use BF_PYTHON_VERSION=2.5

 -- Daniel Hahler <email address hidden> Sat, 16 Feb 2008 20:52:35 +0100

Cool! Thanks for fixing this, Daniel.