From c4c7dce354880830cb4dcef6d8f6443b2be33355 Mon Sep 17 00:00:00 2001 From: miqlas Date: Sat, 24 Jun 2017 17:19:35 +0200 Subject: [PATCH] Blender: bump version, now with 100% more icon (#1458) --- .../blender/additional-files/blender.rdef.in | 157 ++++++++++++++++++ ...nder-2.78a.recipe => blender-2.78c.recipe} | 87 ++++++++-- ...-2.78a.patchset => blender-2.78c.patchset} | 114 ++++++++----- 3 files changed, 305 insertions(+), 53 deletions(-) create mode 100644 media-gfx/blender/additional-files/blender.rdef.in rename media-gfx/blender/{blender-2.78a.recipe => blender-2.78c.recipe} (59%) rename media-gfx/blender/patches/{blender-2.78a.patchset => blender-2.78c.patchset} (89%) diff --git a/media-gfx/blender/additional-files/blender.rdef.in b/media-gfx/blender/additional-files/blender.rdef.in new file mode 100644 index 000000000..499614cb2 --- /dev/null +++ b/media-gfx/blender/additional-files/blender.rdef.in @@ -0,0 +1,157 @@ + +resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + variety = B_APPV_FINAL, + internal = 0, + short_info = "Blender", + long_info = "3D Creation/Animation/Publishing System" +}; + +resource app_signature "application/x-vnd.blender"; + +resource vector_icon { + $"6E636966190395490003EEEEEC05FF02011600381A3B000000000000351DB74C" + $"276D48068C04003103F5790003CE5C0002001600B2536AB66219366219B2536A" + $"4C41E3477B6C030D528B0201160039902600000000000038BE1C4C2666471978" + $"020116003AE4B80000000000003824EA4A62254AEE38020116003CE110000000" + $"0000003A22344A48044AD6EE0400C70201160042F0B4000000000000426372C8" + $"9BE8C7CD7B0201160041A6DB00000000000040F1104249E7455A01020116003A" + $"2352000000000000391F524A78444991BB020116003E708F0000000000003DC1" + $"7C4A31A84872C701954900B10201160041A6DB00000000000040F4C6422AD845" + $"591B020116003D008A0000000000003BE2FCC410D4459BEC020116003EBA6D00" + $"00000000003F06D0C5A9FDCB2EA80201160036CBB70000000000003411844C24" + $"2F49BABA02001600B224F2B61830361830B224F24C3819498F0C020116003987" + $"B600000000000038B79E4C33CC4999D503F5792A190204D023B974D023B91DD0" + $"23B9CCCE76BA13CF63BA13CD89BA13CCC9B974CCC9B9CCCCC9B91DCE76B8D5CD" + $"89B8D5CF63B8D5021CCD6FB8B3CD6FB8B3CD6FB8BFCD79B8EBCD73B8D8CD86B9" + $"13CDB9B95ACD9CB939CDD8B97BCE29B9AACDFEB997CE57B9BECEBCB9C9CE89B9" + $"C9CEF0B9C8CF4FB9A9CF21B9BECF7AB996CFBFB959CFA0B97BCFDDB938CFFFB8" + $"EACFF2B912D005B8D6D00BB8ACD009B8C1D00CB898D009B86FD00CB883D003B8" + $"47CFE0B7FFCFF5B821CFCCB7E0CF96B7ADCFB3B7C4CF96B7ADCF96B7ADCF96B7" + $"ADCF96B7ADCE69B6C6CE69B6C6CE68B6C6CE68B6C5CE68B6C5CE54B6B6CE1DB6" + $"C5CE33B6B6CE07B6D5CE19B6FDCE05B6EDCE42B71DCE95B760CE6BB740CE95B7" + $"60CD17B760CD17B760CCECB760CCCDB793CCD2B775CCC8B7ADCD03B7CECCDDB7" + $"CECD43B7CECDC5B7CECD84B7CECDC5B7CECC6BB8CECC6BB8CECC6AB8CECC69B8" + $"CFCC6AB8CFCC49B8E8CC53B92CCC3EB912CC68B947CCB5B92CCC94B947CCB5B9" + $"2CCD72B891CD72B891CD72B891CD6FB8B3CD6FB8A6CD6FB8B3021CCD6FB8B3CD" + $"6FB8B3CD6FB8BFCD79B8EBCD73B8D8CD86B913CDB9B95ACD9CB939CDD8B97BCE" + $"29B9AACDFEB997CE57B9BECEBCB9C9CE89B9C9CEF0B9C8CF4FB9A9CF21B9BECF" + $"7AB996CFBFB959CFA0B97BCFDDB938CFFFB8EACFF2B912D005B8D6D00BB8ACD0" + $"09B8C1D00CB898D009B86FD00CB883D003B847CFE0B7FFCFF5B821CFCCB7E0CF" + $"96B7ADCFB3B7C4CF96B7ADCF96B7ADCF96B7ADCF96B7ADCE69B6C6CE69B6C6CE" + $"68B6C6CE68B6C5CE68B6C5CE54B6B6CE1DB6C5CE33B6B6CE07B6D5CE19B6FDCE" + $"05B6EDCE42B71DCE95B760CE6BB740CE95B760CD17B760CD17B760CCECB760CC" + $"CDB793CCD2B775CCC8B7ADCD03B7CECCDDB7CECD43B7CECDC5B7CECD84B7CECD" + $"C5B7CECC6BB8CECC6BB8CECC6AB8CECC69B8CFCC6AB8CFCC49B8E8CC53B92CCC" + $"3EB912CC68B947CCB5B92CCC94B947CCB5B92CCD72B891CD72B891CD72B891CD" + $"6FB8B3CD6FB8A6CD6FB8B30204CF8EB87ACF8EB814CF8EB8E1CEBFB933CF32B9" + $"33CE4DB933CDF1B87ACDF1B8E1CDF1B814CEBFB7C2CE4DB7C2CF32B7C20204CF" + $"8EB87ACF8EB814CF8EB8E1CEBFB933CF32B933CE4DB933CDF1B87ACDF1B8E1CD" + $"F1B814CEBFB7C2CE4DB7C2CF32B7C20220CE43B6D3CE4CB6D3CE3BB6D3CE2BB6" + $"DACE32B6D5CE2BB6DACE2BB6DACE2BB6DACE25B6DECE24B6E4CE24B6E2CE24B6" + $"E6CE28B6EBCE24B6E7CE28B6EBCE29B6ECCE29B6ECCE2CB6EECEA5B751CEA5B7" + $"51CEAEB758CEADB76DCEB1B763CEAAB776CE96B775CEA0B775CE1BB776CD17B7" + $"75CD17B775CD02B775CCE2B798CCE4B781CCE1B7AECD04B7B8CCF6B7B8CD04B7" + $"B8CDC5B7B7CDC5B7B7CDCFB7B7CDDCB7C6CDD9B7BCCDE0B7D0CDD4B7D8CDDCB7" + $"D2CDD4B7D8CC7AB8E2CC7AB8E2CC7AB8E2CC7AB8E2CC7AB8E2CC78B8E3CC78B8" + $"E3CC78B8E3CC6CB8ECCC62B903CC65B8F8CC5FB90ECC66B91DCC61B916CC71B9" + $"2ACCA7B91BCC8FB92ECCA7B91BCD64B880CD64B880CD6CB87ACD7EB87ECD75B8" + $"79CD87B883CD88B895CD8AB88BCD88B895CD86B8B3CD86B8AACD8AB8ECCDCAB9" + $"4BCDA6B91FCE08B990CEBCB9B4CE61B9B0CF18B9B3CFAFB949CF71B98DD021B8" + $"BECF86B7C1D002B825CF24B771CE5AB6DACEBEB727CE59B6D9CE59B6D9CE59B6" + $"D9CE59B6D9CE59B6D9CE59B6D9CE54B6D50208CE40B872CE3EB892CE42B852CE" + $"68B823CE51B836CE7FB80FCEBFB803CE9EB803CEE1B803CF16B823CEFFB80FCF" + $"2DB836CF3EB872CF3DB852CF40B892CF1CB8C6CF33B8B0CF05B8DDCEBFB8EB66" + $"B8EBCE9AB8EBCE62B8C6CE79B8DDCE4BB8B00204C6CEC5AEC6CEC4BDC6CEC6A0" + $"C231C764C4BDC764BFA5C764BD95C5AEBD95C6A0BD95C4BDC231C3F9BFA5C3F9" + $"C4BDC3F90204C6CEC5AEC6CEC4BDC6CEC6A0C231C764C4BDC764BFA5C764BD95" + $"C5AEBD95C6A0BD95C4BDC231C3F9BFA5C3F9C4BDC3F90204CA30C4CFCA30C2EF" + $"CA30C6B0C103C836C614C836BBF1C836B7D5C4CFB7D5C6B0B7D5C2EFC103C169" + $"BBF1C169C614C1690204CA30C4CFCA30C2EFCA30C6B0C103C836C614C836BBF1" + $"C836B7D5C4CFB7D5C6B0B7D5C2EFC103C169BBF1C169C614C169021CBB62C0AC" + $"BB62C0ACBB63C0F0BB9AC1DFBB79C176BBDFC2BCBCF8C43DBC55C389BDA0C4F6" + $"BF5DC5F5BE6EC58BC058C664C281C69CC168C69DC39BC69CC5A6C5F2C4ABC662" + $"C694C587C80AC439C763C4F2C8ADC383C968C1D9C923C2B6C98BC169C9AAC086" + $"C9A1C0F8C9B3C016C99FBF35C9AFBFA5C980BE5BC8C0BCD2C934BD8DC855BC26" + $"C728BB11C7CCBB90C728BB11C729BB11C729BB11C729BB11C0B8B61FC0B8B61F" + $"C0B7B61EC0B4B61CC0B6B61DC048B5C9BF1BB61CBF92B5C9BEA3B670BF04B74C" + $"BE99B6F4BFE6B7FFC1ACB96CC0C8B8BAC1ACB96CB980B96BB980B96BB892B96B" + $"B7E8BA81B806B9DCB7CEBB13B910BBC8B842BBC8BA70BBC8BD36BBC6BBD4BBC7" + $"BD36BBC6B5CFC140B5CFC140B5CCC142B5C7C14627C144B515C1CFB54BC342B4" + $"DBC2B2B5BEC3D5B765C343B6B1C3D5B765C343BB70BFF5BB70BFF5BB70BFF5BB" + $"62C0ACBB61C067BB62C0AC0204C700BF77C700BD47C700C1A6C294C36CC505C3" + $"6CC022C36CBE27BF77BE27C1A6BE27BD47C294BB81C022BB81C505BB810204C7" + $"00BF77C700BD47C700C1A6C294C36CC505C36CC022C36CBE27BF77BE27C1A6BE" + $"27BD47C294BB81C022BB81C505BB810220BFECB665C01CB665BFBCB666BF69B6" + $"8CBF8AB674BF69B68CBF69B68CBF69B68CBF48B6A3BF40B6C3BF41B6B8BF3FB6" + $"CEBF56B6EBBF3EB6D7BF59B6ECBF5DB6F0BF5BB6EEBF6C2AC205B919C205B919" + $"C232B93EC22FB9B0C242B97AC21CB9E6C1B0B9DEC1E9B9DEBF10B9E4B97DB9E0" + $"B97DB9E0B90BB9E0B85DBA9DB865BA1EB855BB17B919BB4BB8C9BB4BB919BB4B" + $"BD36BB49BD36BB49BD70BB49BDB6BB9ABDA4BB63BDC9BBD1BD89BBFDBDB7BBDA" + $"BD89BBFDB621C1ACB621C1ACB621C1ACB621C1ADB621C1ACB619C1B2B61AC1B2" + $"B617C1B4B5D8C1E5B5A0C262B5AFC227B592C29DB5B7C2EFB59BC2CBB5F0C338" + $"B71AC2E4B694C351B71AC2E4BB24BF96BB24BF96BB4FBF73BBB2BF89BB81BF6D" + $"BBE2BFA4BBECC006BBF3BFCFBBECC006BBDFC0AABBDEC07BBBF6C1E4BD52C3EC" + $"BC8CC2FEBEA9C567C281C62AC08DC616C476C624C7B5C3E3C6614ECA23C0E9C6" + $"D5BB7DC97BBDA4C4BDB9C9C066B68BC28BB831C065B68AC064B68AC065B68AC0" + $"63B689C062B688C062B688C049B6750208BFEFBF30BFE5BFE1BFF9BE82C0CCBD" + $"7EC04DBDEAC149BD13C2A8BCD2C1F1BCD2C360BCD2C485BD7EC408BD13C504BD" + $"EAC562BF2FC558BE82C56CBFE1C4A8C101C524C087C428C17EC2A8C1CCC373C1" + $"CCC1DEC1CCC0A9C101C128C17EC02CC0870214BF5CB6F0BEC5B65CBF5CB6F0C2" + $"06B91BC206B91BC241B94BC1A9B9B0C217B9B1BF09B9B6B992B9ACB992B9ACB9" + $"2FB9ACB87BBA75B87BB9F1B87BBAF9B91BBB0AB8CBBB0BB91BBB0ABD35BB0ABD" + $"35BB0ABDE3BB0EBD87BBFCBDF6BB9DBD87BBFCB623C1ADB623C1ADB623C1ADB6" + $"1FC1ADB61FC1ADB617C1B3B61BC1B0B619C1B3B5D9C1E3B5A0C263B5AFC228B5" + $"92C29EB5B7C2EDB59BC2C9B5F0C336B70CC2A6B685C312B70CC2A6BB09BF5DBB" + $"09BF5DBB6CBF0CBC29C003BC3BBF4FBC0FC10EBC97C25DBC35C18EBDA7C496C8" + $"D0BD62C12BBC9FC86BBCB1C72BBB59C7DDBBEAC513B9A5C0C4B671C0C4B671C0" + $"21B5F8021CBB62C0ACBB62C0ACBB63C0F0BB9AC1DFBB79C176BBDFC2BCBCF8C4" + $"3DBC55C389BDA0C4F6BF5DC5F5BE6EC58BC058C664C281C69CC168C69DC39BC6" + $"9CC5A6C5F2C4ABC662C694C587C80AC439C763C4F2C8ADC383C968C1D9C923C2" + $"B6C98BC169C9AAC086C9A1C0F8C9B3C016C99FBF35C9AFBFA5C980BE5BC8C0BC" + $"D2C934BD8DC855BC26C728BB11C7CCBB90C728BB11C729BB11C729BB11C729BB" + $"11C0B8B61FC0B8B61FC0B7B61EC0B4B61CC0B6B61DC048B5C9BF1BB61CBF92B5" + $"C9BEA3B670BF04B74CBE99B6F4BFE6B7FFC1ACB96CC0C8B8BAC1ACB96CB980B9" + $"6BB980B96BB892B96BB7E8BA81B806B9DCB7CEBB13B910BBC8B842BBC8BA70BB" + $"C8BD36BBC6BBD4BBC7BD36BBC6B5CFC140B5CFC140B5CCC142B5C7C14627C144" + $"B515C1CFB54BC342B4DBC2B2B5BEC3D5B765C343B6B1C3D5B765C343BB70BFF5" + $"BB70BFF5BB70BFF5BB62C0ACBB61C067BB62C0AC0224BFDEB61DC01DB61DBF9E" + $"B61DBF2BB651BF5CB62EBEF9B674BEE0B6C4BEE3B69FBEDEB6E9BF18B730BEED" + $"B70DBFFBB7E3C1C2B950C0DFB89EC1D9B961C1CDB998C1DEB981C1C3B9A6C1A0" + $"B9ADC1B2B9AEC1A0B9ADB973B9ADB973B9ADB904B9ADB879B9F0B8B3B9C8B840" + $"BA19B811BA94B81EBA4DB7FDBB05B903BBA0B853BBA0BA63BBA1BD29BB9DBBC7" + $"BB9DBD45BB9D3ABBD13ABBB5BD5BBBE1BD47BBFABD54BBF0BD47BBFAB5DFC176" + $"B5DFC176B5DBC179B5D7C17AB5DAC178B537C1F5B567C32EB50CC2B9B5C4C3A4" + $"B739C32629C3AAB739C326BB41BFD9BB41BFD9BB56BFC6BB8ABFDDBB77BFC7BB" + $"94BFE8BB96C005BB98BFF6BB96C005BB8BC0B8BB8AC07ABB8CC0F3BBBFC1DBBB" + $"A0C177BC03C2B1BD12C427BC74C378BDB5C4DBBF66C5D0BE7EC569C05BC63CC2" + $"75C674C162C674C388C673C583C5D0C48FC63DC66BC568C7DAC423C738C4D8C8" + $"79C374C92AC1D7C8E7C2ADC94CC16AC969C08FC960C0FDC971C023C95EBF47C9" + $"6DBFB4C940BE74C886BCF7C8F7BDAD55BC51C6FFBB47C79DBBC2C6FFBB47C08D" + $"B655C08DB655C08BB655C089B655C08AB655C07EB64CC089B651C07EB64AC05E" + $"280208C00DB61FC051B61FBF92B61FBF3BB6A5BF21B657BF5CB64AC0CBB682C0" + $"4CB623C0CBB682C74FBB80C52EB9C4C7F5BC07C8E0BD64C87CBCBCC8E9BD65C8" + $"FCBD66C8F3BD65C895BCB1C74FBB54C805BBE7C52EB998C0CBB656C0CBB656C0" + $"97B62F0207B4E5B610B4F6B644B4DAB637B46FB659B4B0B65AB1C4B65FAC33B6" + $"56AC33B656ABCEB656AB17B722AB17B69BAB17B72AAB18B73AAB17B732AB29B6" + $"C1AC33B6820DB682AC33B682B46FB685B1C4B68CB4C9B687020CAE61B509AE6B" + $"B539AE5AB52DAE1DB575AE43B554AE1DB575A697BB3FA697BB3FA697BB3FA694" + $"BB3FA694BB3FA68CBB45A68FBB43A68DBB45A64CBB77A613BBF9A622BBBDA60C" + $"BC15A60DBC42A60BBC2CA60FBC39A613BC25A610BC2FA622BBE9A68FBB6FA64C" + $"BBA3A68DBB72A694BB6BA68CBB71A694BB6BA697BB6BA697BB6BA697BB6BAE1D" + $"B5A2AE1DB5A2AE53B5730203B121B75CB122B769B11AB79FB118B80EB117B7D9" + $"B119B7E5B121B786B11CB7B8B122B7770202B587C1F5B591C2C0B54EC2E9B6B8" + $"C357B595C377B5F1C33B0204CF6ABEE3CF6ABEA8CF6ABF1DCE4DBF4CCEEABF4C" + $"CDAFBF4CCD30BEE3CD30BF1DCD30BEA8CE4DBE79CDAFBE79CEEABE79090A0401" + $"0012451E95000000000000451E95D11415CB476B01178000040A0201030245FD" + $"19000000000000460BA3D2031DCC79800A04010002451E95000000000000451E" + $"95D11415CB476B0A05010102451E95000000000000451E95D11415CB476B0A02" + $"010302451E95000000000000451E95D11415CB476B0A06010212451E95000000" + $"000000451E95D11415CB476B01178022040A02010412451E9500000000000045" + $"1E95D11415CB476B01178000040A07010312451E95000000000000451E95D114" + $"15CB476B01178000040A08010602451E95000000000000451E95D11415CB476B" +}; diff --git a/media-gfx/blender/blender-2.78a.recipe b/media-gfx/blender/blender-2.78c.recipe similarity index 59% rename from media-gfx/blender/blender-2.78a.recipe rename to media-gfx/blender/blender-2.78c.recipe index 5114e04c4..25176471d 100644 --- a/media-gfx/blender/blender-2.78a.recipe +++ b/media-gfx/blender/blender-2.78c.recipe @@ -7,13 +7,15 @@ Advanced users employ Blender’s API for Python scripting to customize the \ application and write specialized tools; often these are included in Blender’s \ future releases. Blender is well suited to individuals and small studios who \ benefit from its unified pipeline and responsive development process." -HOMEPAGE="http://www.blender.org" +HOMEPAGE="http://www.blender.org/" COPYRIGHT="2002-2017 Blender Foundation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://download.blender.org/source/blender-$portVersion.tar.gz" -CHECKSUM_SHA256="014a14b1ba00c0e651f106469b2e5dd444f11be5a7af48056f0ed59de90cceaf" +CHECKSUM_SHA256="64a98ff30300f79385ddb9ad016aa790a92720ff2feb84ddb1d097e6531dd338" PATCHES="blender-$portVersion.patchset" +ADDITIONAL_FILES="blender.rdef.in" + ARCHITECTURES="!x86_gcc2 !x86 x86_64" PYTHON_VERSION="3.6" @@ -27,6 +29,15 @@ PROVIDES=" " REQUIRES=" haiku + lib:libboost_atomic + lib:libboost_chrono + lib:libboost_date_time + lib:libboost_filesystem + lib:libboost_locale + lib:libboost_regex + lib:libboost_system + lib:libboost_thread + lib:libfftw3 lib:libfreetype lib:libgcc_s lib:libgl @@ -34,38 +45,60 @@ REQUIRES=" lib:libglu lib:libgomp lib:libhalf +# lib:libhdf5 lib:libiex_2_2 lib:libilmimf_2_2 lib:libilmthread_2_2 lib:libimath_2_2 lib:libjpeg + lib:liblzo2 + lib:libopencolorio lib:libopenimageio + lib:libopenjp2 lib:libpng16 - lib:libsdl2_2.0 - lib:libtiff - lib:libz lib:libpython${PYTHON_VERSION}m + lib:libsdl2_2.0 +# lib:libsndfile + lib:libtiff + lib:libxml2 + lib:libz " BUILD_REQUIRES=" haiku_devel +# devel:eigen + devel:libboost_atomic + devel:libboost_chrono + devel:libboost_date_time + devel:libboost_filesystem + devel:libboost_locale + devel:libboost_regex + devel:libboost_system + devel:libboost_thread + devel:libfftw3 devel:libfreetype devel:libgl devel:libglew devel:libglu devel:libgomp devel:libhalf +# devel:libhdf5 devel:libiex_2_2 devel:libilmimf_2_2 devel:libilmthread_2_2 devel:libimath_2_2 devel:libjpeg + devel:liblzo2 + devel:libopencolorio devel:libopenimageio + devel:libopenjp2 devel:libpng16 - devel:libsdl2_2.0 - devel:libtiff - devel:libz devel:libpython${PYTHON_VERSION}m + devel:libsdl2_2.0 +# devel:libsndfile + devel:libtiff + devel:libxml2 + devel:libz " BUILD_PREREQUIRES=" cmd:cmake @@ -75,6 +108,7 @@ BUILD_PREREQUIRES=" cmd:make cmd:python${PYTHON_VERSION} cmd:sed + llvm #python3_numpy #maybe later #python3_requests #maybe later " @@ -89,14 +123,21 @@ BUILD() -DPYTHON_INCLUDE_DIR=/system/develop/headers/python${PYTHON_VERSION}m/ \ -DPYTHON_LIBRARY=/system/lib/libpython${PYTHON_VERSION}m.so.1.0 \ -DPYTHON_EXECUTABLE=/bin/python${PYTHON_VERSION} \ - -DWITH_CYCLES:BOOL=OFF \ - -DWITH_BOOST:BOOL=OFF \ -DWITH_PYTHON_INSTALL:BOOL=OFF \ -DWITH_PYTHON_INSTALL_NUMPY:BOOL=OFF \ - -DWITH_PYTHON_INSTALL_REQUESTS:BOOLv=OFF \ + -DWITH_PYTHON_INSTALL_REQUESTS:BOOL=OFF \ + -DWITH_BOOST:BOOL=ON \ + -DWITH_CYCLES:BOOL=ON \ -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PATH \ -DWITH_SDL:BOOL=ON \ -DWITH_GHOST_SDL:BOOL=ON \ + -DWITH_GAMEENGINE_DECKLINK:BOOL=OFF \ + -DWITH_OPENIMAGEIO:BOOL=ON \ + -DWITH_FFTW3:BOOL=ON \ + -DWITH_SYSTEM_OPENJPEG:BOOL=ON \ + -DWITH_SYSTEM_EIGEN3:BOOL=OFF \ + -DWITH_IMAGE_OPENEXR:BOOL=ON \ + -DWITH_LLVM:BOOL=ON \ -Wno-dev make $jobArgs @@ -105,17 +146,33 @@ BUILD() INSTALL() { cd build_haiku - make install + make install $jobArgs + + mv $INSTALL_PATH/blender $INSTALL_PATH/Blender + strip $INSTALL_PATH/Blender + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2 | sed 's/[a-z]*//g'`" + local MINOR="`echo 0`" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + $portDir/additional-files/blender.rdef.in > blender.rdef + + addResourcesToBinaries blender.rdef \ + $INSTALL_PATH/Blender cd $INSTALL_PATH - mkdir -p $binDir $docDir/blender + mkdir -p $docDir/blender mv GPL-license.txt GPL3-license.txt \ LICENSE-bfont.ttf.txt jemalloc-license.txt \ Python-license.txt copyright.txt readme.html \ - blender.svg ocio-license.txt $docDir/blender + blender.svg ocio-license.txt LICENSE-bmonofont-i18n.ttf.txt \ + LICENSE-droidsans.ttf.txt $docDir/blender rm -rf blender.desktop - strip blender + addAppDeskbarSymlink $INSTALL_PATH/Blender Blender } diff --git a/media-gfx/blender/patches/blender-2.78a.patchset b/media-gfx/blender/patches/blender-2.78c.patchset similarity index 89% rename from media-gfx/blender/patches/blender-2.78a.patchset rename to media-gfx/blender/patches/blender-2.78c.patchset index 88d13607e..9ae4e22b0 100644 --- a/media-gfx/blender/patches/blender-2.78a.patchset +++ b/media-gfx/blender/patches/blender-2.78c.patchset @@ -1,41 +1,11 @@ -From ef7aeda91a0f2f5916e04cab369a744014e9d799 Mon Sep 17 00:00:00 2001 +From 2e4892faf4e721f3ad8ef2486037bdc8df03dd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Wed, 1 Feb 2017 21:55:43 +0100 -Subject: [PATCH] Haiku supporting patch +Subject: Haiku supporting patch ---- - CMakeLists.txt | 4 +- - build_files/cmake/Modules/FindFftw3.cmake | 2 + - build_files/cmake/Modules/FindGLEW.cmake | 2 + - build_files/cmake/Modules/FindIcuLinux.cmake | 2 + - build_files/cmake/Modules/FindLZO.cmake | 2 + - build_files/cmake/Modules/FindOpenColorIO.cmake | 2 + - build_files/cmake/Modules/FindOpenEXR.cmake | 2 + - build_files/cmake/Modules/FindOpenImageIO.cmake | 2 + - build_files/cmake/Modules/FindOpenJPEG.cmake | 2 + - build_files/cmake/Modules/FindPCRE.cmake | 2 + - build_files/cmake/Modules/FindSDL2.cmake | 5 +- - build_files/cmake/Modules/FindSndFile.cmake | 2 + - build_files/cmake/Modules/FindXML2.cmake | 2 + - build_files/cmake/macros.cmake | 3 + - build_files/cmake/platform/platform_unix.cmake | 6 +- - extern/glog/src/config.h | 2 + - extern/glog/src/config_haiku.h | 172 +++++++++++++++++++++ - intern/guardedalloc/intern/mallocn_intern.h | 3 + - intern/libmv/libmv/numeric/numeric.h | 2 +- - source/blender/blenkernel/intern/bvhutils.c | 13 ++ - source/blender/blenkernel/intern/font.c | 14 ++ - source/blender/blenkernel/intern/particle_system.c | 14 ++ - source/blender/blenkernel/intern/subsurf_ccg.c | 15 ++ - source/blender/blenlib/BLI_sys_types.h | 2 +- - source/blender/blenlib/BLI_threads.h | 4 + - source/blender/blenlib/intern/fileops.c | 12 ++ - source/blender/blenlib/intern/storage.c | 2 +- - 27 files changed, 288 insertions(+), 7 deletions(-) - create mode 100644 extern/glog/src/config_haiku.h diff --git a/CMakeLists.txt b/CMakeLists.txt -index 578f913..73a17e6 100644 +index 8a48e6e..a993922 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,7 +193,7 @@ endif() @@ -47,7 +17,7 @@ index 578f913..73a17e6 100644 set(WITH_X11 ON) endif() -@@ -858,7 +858,7 @@ set(CC_REMOVE_STRICT_FLAGS) +@@ -859,7 +859,7 @@ set(CC_REMOVE_STRICT_FLAGS) # libraries to link the binary with passed to target_link_libraries() # known as LLIBS to scons @@ -223,10 +193,10 @@ index 40cc332..09237ee 100644 FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake -index 5a67ac9..b518956 100644 +index ead4fd4..61971b4 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake -@@ -1532,6 +1532,7 @@ function(find_python_package +@@ -1525,6 +1525,7 @@ function(find_python_package PATH_SUFFIXES site-packages dist-packages @@ -234,7 +204,7 @@ index 5a67ac9..b518956 100644 NO_DEFAULT_PATH ) -@@ -1542,6 +1543,8 @@ function(find_python_package +@@ -1535,6 +1536,8 @@ function(find_python_package "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', " "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', " "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', " @@ -678,5 +648,73 @@ index 3edc00a..30e9ab1 100644 # include # define USE_STATFS_STATVFS -- -2.11.0 +2.12.2 + + +From 6b0e182a54b090b5c4cf0b80724c5bbec1069560 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 21 Jun 2017 15:56:25 +0200 +Subject: Build fix + + +diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h +index e97a250..bc45b8a 100644 +--- a/source/blender/blenlib/BLI_math_base.h ++++ b/source/blender/blenlib/BLI_math_base.h +@@ -86,7 +86,7 @@ static const int NAN_INT = 0x7FC00000; + #endif + + /* do not redefine functions from C99, POSIX.1-2001 or MSVC12 (partial C99) */ +-#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER)) ++#if !(defined(_ISOC99_SOURCE) || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || defined(_MSC_VER) || defined(__HAIKU__)) + + #ifndef sqrtf + #define sqrtf(a) ((float)sqrt(a)) +-- +2.12.2 + + +From c26b8564a028372d74eadd44be5c82be1bdf6811 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Wed, 21 Jun 2017 17:26:46 +0200 +Subject: Searchpaths for cmake + + +diff --git a/build_files/cmake/Modules/FindEigen3.cmake b/build_files/cmake/Modules/FindEigen3.cmake +index 400e8eb..fdd7936 100644 +--- a/build_files/cmake/Modules/FindEigen3.cmake ++++ b/build_files/cmake/Modules/FindEigen3.cmake +@@ -29,6 +29,8 @@ SET(_eigen3_SEARCH_DIRS + /sw # Fink + /opt/local # DarwinPorts + /opt/csw # Blastwave ++ /system/lib # Haiku ++ /system/develop/headers # Haiku + ) + + FIND_PATH(EIGEN3_INCLUDE_DIR +@@ -38,7 +40,7 @@ FIND_PATH(EIGEN3_INCLUDE_DIR + HINTS + ${_eigen3_SEARCH_DIRS} + PATH_SUFFIXES +- include/eigen3 ++ include/eigen3 Eigen + ) + + # handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if +diff --git a/build_files/cmake/Modules/FindHDF5.cmake b/build_files/cmake/Modules/FindHDF5.cmake +index 56ceda8..990a594 100644 +--- a/build_files/cmake/Modules/FindHDF5.cmake ++++ b/build_files/cmake/Modules/FindHDF5.cmake +@@ -31,6 +31,8 @@ SET(_hdf5_SEARCH_DIRS + /opt/local # DarwinPorts + /opt/csw # Blastwave + /opt/lib/hdf5 ++ /system/lib # Haiku ++ /system/develop/headers # Haiku + ) + + FIND_LIBRARY(HDF5_LIBRARY +-- +2.12.2