Bug 196278 - [maintainer] graphics/openshadinglanguage: Add alignment patch
Summary: [maintainer] graphics/openshadinglanguage: Add alignment patch
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Marcus von Appen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-12-26 06:18 UTC by Shane
Modified: 2015-02-08 20:52 UTC (History)
1 user (show)

See Also:


Attachments
alignment patch merged to osl 1.5.11 (9.80 KB, text/plain)
2014-12-26 06:18 UTC, Shane
no flags Details
alignment patch merged to osl 1.5.12 (13.88 KB, patch)
2014-12-30 13:26 UTC, Shane
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Shane 2014-12-26 06:18:07 UTC
Created attachment 150967 [details]
alignment patch merged to osl 1.5.11

Following on from OSL related bugs found in blender a patch was accepted into openshadinglaguage - see https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91

As noted in the comments this patch is not planned to be added to the 1.5.x development of OSL due to the API change. This patch is required to support blender version v2.7.3 and higher so needs to be applied to the current OSL version until such time as 1.6.x is released.

As a reference, the same patch is being added to OSL 1.5.11 for official windows builds - https://developer.blender.org/rBL61458 - and OSX builds - https://developer.blender.org/rBL61447

This change relates to blender commit - https://developer.blender.org/rB4cb0e256789231a329780bbdc8706e6aa031e52e
Comment 1 Shane 2014-12-30 13:26:54 UTC
Created attachment 151116 [details]
alignment patch merged to osl 1.5.12

As osl 1.5.12 was released a few hours after I submitted the initial patch I have merged the 1.5.12 release into this. Besides the version and checksum this removes files/patch-src__testshade__testshade.cpp and removes part of files/patch-CMakeLists.txt.

The same alignment patch is still included.
Comment 2 Marcus von Appen freebsd_committer freebsd_triage 2015-02-08 20:51:23 UTC
Committed, thanks!
Comment 3 commit-hook freebsd_committer freebsd_triage 2015-02-08 20:52:40 UTC
A commit references this bug:

Author: mva
Date: Sun Feb  8 20:51:55 UTC 2015
New revision: 378684
URL: https://svnweb.freebsd.org/changeset/ports/378684

Log:
  - Update to version 1.5.12
  - Add an memory alignment patch for graphics/blender

  Changelog: https://github.com/imageworks/OpenShadingLanguage/blob/master/CHANGES

  PR:		196278
  Submitted by:	FreeBSD@ShaneWare.Biz (maintainer)

Changes:
  head/graphics/openshadinglanguage/Makefile
  head/graphics/openshadinglanguage/distinfo
  head/graphics/openshadinglanguage/files/patch-alignment.patch
  head/graphics/openshadinglanguage/files/patch-src__testshade__testshade.cpp