API tools faq
paste
Advertisement
david_david

blender-svn_diff

david_david
Feb 1st, 2015
214
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.82 KB | None | 0 0
raw download clone embed print report
  1. Index: blender.spec
  2. ===================================================================
  3. --- blender.spec (révision 812963)
  4. +++ blender.spec (copie de travail)
  5. @@ -1,52 +1,54 @@
  6. %define __python %{__python3}
  7.  
  8. Name: blender
  9. -Version: 2.71
  10. -Release: %mkrel 11
  11. +Version: 2.73a
  12. +Release: %mkrel 0.1
  13. Summary: A fully functional 3D modeling/rendering/animation package
  14. +License: GPLv2+
  15. Group: Graphics/3D
  16. -Source0: http://download.blender.org/source/blender-v%{version}.tar.gz
  17. -Patch0: blender-2.67a-localedir.patch
  18. +URL: http://www.blender.org/
  19. +Source0: http://download.blender.org/source/blender-%{version}.tar.gz
  20. +Patch0: blender-2.73a-localedir.patch
  21. Patch1: blender-2.60-error-when-missing-sse.patch
  22. Patch2: blender-2.58-static-lib.patch
  23. Patch3: blender-2.65-openjpeg_stdbool.patch
  24. # Patch submitted upstream - Blender Patches item #19234,
  25. -Patch6: blender-2.67a-uninit-var.patch
  26. -Patch7: blender-2.71-link.patch
  27. -Patch8: blender-2.67-jack-libname.patch
  28. -Patch9: harbour-3.2.0-mga-minilzo-2.8.patch
  29. -Patch10: blender-2.71-parallel.patch
  30. -Patch11: blender-2.71-sse2.patch
  31. -URL: http://www.blender.org/
  32. -License: GPLv2+
  33. +Patch4: blender-2.67a-uninit-var.patch
  34. +Patch5: blender-2.67-jack-libname.patch
  35. +Patch6: blender-2.71-sse2.patch
  36. +Patch7: blender-2.73a-link.patch
  37. +
  38. BuildRequires: cmake >= 2.8
  39. BuildRequires: ffmpeg-devel
  40. -BuildRequires: glew-devel
  41. -BuildRequires: OpenEXR-devel
  42. -BuildRequires: SDL-devel
  43. -BuildRequires: libx11-devel
  44. -BuildRequires: libxi-devel
  45. -BuildRequires: freetype2-devel
  46. BuildRequires: libgomp-devel
  47. BuildRequires: jpeg-devel
  48. -BuildRequires: png-devel
  49. -BuildRequires: openjpeg-devel
  50. -BuildRequires: openal-devel
  51. -BuildRequires: libsamplerate-devel
  52. -BuildRequires: sndfile-devel
  53. -BuildRequires: libjack-devel
  54. -BuildRequires: tiff-devel
  55. -BuildRequires: fftw3-devel
  56. -BuildRequires: python3-devel >= 3.2
  57. BuildRequires: boost-devel
  58. +BuildRequires: jemalloc-devel
  59. +BuildRequires: openCOLLADA-devel
  60. BuildRequires: openimageio-devel
  61. -BuildRequires: opencolorio-devel
  62. +BuildRequires: pkgconfig(OpenColorIO)
  63. +BuildRequires: pkgconfig(libopenjpeg1)
  64. +BuildRequires: pkgconfig(jack)
  65. +BuildRequires: pkgconfig(libtiff-4)
  66. +BuildRequires: pkgconfig(glew)
  67. +BuildRequires: pkgconfig(glu)
  68. +BuildRequires: pkgconfig(OpenEXR)
  69. +BuildRequires: pkgconfig(sdl)
  70. +BuildRequires: pkgconfig(x11)
  71. +BuildRequires: pkgconfig(xi)
  72. +BuildRequires: pkgconfig(freetype2)
  73. +BuildRequires: pkgconfig(libpng)
  74. +BuildRequires: pkgconfig(openal)
  75. +BuildRequires: pkgconfig(samplerate)
  76. +BuildRequires: pkgconfig(sndfile)
  77. +BuildRequires: pkgconfig(fftw3)
  78. +BuildRequires: pkgconfig(python3) >= 3.2
  79. # ovitters: pkgconfig(gobject-introspection-1.0) includes script to determine typelib() auto buildrequires
  80. BuildRequires: pkgconfig(gobject-introspection-1.0)
  81. -Requires: python(abi) >= 3.2
  82. -Recommends: %{_lib}jack0
  83. -Requires(post,preun): GConf2
  84.  
  85. +Requires: python(abi) >= 3.2
  86. +Requires(post,preun): GConf2
  87. +
  88. %description
  89. Blender is the in-house software of a high quality animation studio.
  90. It has proven to be an extremely fast and versatile design instrument.
  91. @@ -59,32 +61,51 @@
  92. implemented.
  93.  
  94. %prep
  95. -%setup -qn %{name}-v%{version}
  96. -#patch0 -p1 -b .localedir
  97. +%setup -qn %{name}-%{version}
  98. +
  99. +%patch0 -p1 -b .localedir
  100. %patch1 -p0 -b .sse
  101. %patch2 -p0 -b .static
  102. %patch3 -p1 -b .bool
  103. -%patch6 -p0
  104. -%patch7 -p0
  105. -%patch8 -p0
  106. -pushd extern/lzo/minilzo
  107. -%patch9 -p5 -b .lzo
  108. -popd
  109. -%patch10 -p1
  110. -%patch11 -p0 -b .sse2
  111. +%patch4 -p0 -b .uninit
  112. +%patch5 -p0 -b .jack
  113. +%patch6 -p0 -b .sse2
  114. +%patch7 -p1 -b .link
  115.  
  116. +find -name '.svn' -print | xargs rm -rf
  117. +
  118. %build
  119. export LD=/usr/bin/ld.gold
  120. %ifarch %{ix86}
  121. # build non-sse flavour
  122. -%cmake -DWITH_INSTALL_PORTABLE=OFF -DWITH_PLAYER=ON \
  123. - -DWITH_PYTHON=ON -DWITH_PYTHON_INSTALL=OFF \
  124. - -DPYTHON_VERSION=%{py3ver} -DWITH_BUILTIN_GLEW=OFF \
  125. - -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON \
  126. +%cmake \
  127. + -DCMAKE_SKIP_RPATH=ON \
  128. + -DBUILD_SHARED_LIBS=OFF \
  129. + -DWITH_INSTALL_PORTABLE=OFF \
  130. + -DWITH_GAMEENGINE:BOOL=ON \
  131. + -DWITH_PLAYER:BOOL=ON \
  132. + -DWITH_PYTHON:BOOL=ON \
  133. + -DPYTHON_VERSION:STRING=%{py3_ver} \
  134. + -DWITH_PYTHON_INSTALL:BOOL=OFF \
  135. + -DWITH_BUILTIN_GLEW:BOOL=OFF \
  136. + -DWITH_CODEC_FFMPEG:BOOL=ON \
  137. + -DWITH_CODEC_SNDFILE:BOOL=ON \
  138. + -DWITH_IMAGE_OPENJPEG:BOOL=ON \
  139. + -DWITH_OPENCOLLADA:BOOL=ON \
  140. + -DOPENCOLLADA=%{_includedir} \
  141. + -DWITH_FFTW3:BOOL=ON \
  142. + -DWITH_MOD_OCEANSIM:BOOL=ON \
  143. + -DWITH_CYCLES:BOOL=ON \
  144. + -DWITH_CXX_GUARDEDALLOC:BOOL=OFF \
  145. + -DWITH_MEM_JEMALLOC:BOOL=ON \
  146. + -DWITH_OPENCOLORIO:BOOL=ON \
  147. + -DWITH_DOC_MANPAGE:BOOL=ON \
  148. %ifarch %{ix86}
  149. - -DSUPPORT_SSE2_BUILD=OFF -DSUPPORT_SSE_BUILD=OFF \
  150. + -DSUPPORT_SSE2_BUILD=OFF \
  151. + -DSUPPORT_SSE_BUILD=OFF \
  152. %endif
  153. - -DWITH_RAYOPTIMIZATION=OFF -DWITH_JACK_DYNLOAD=ON
  154. + -DWITH_RAYOPTIMIZATION:BOOL=OFF \
  155. + -DWITH_JACK:BOOL=ON
  156. %make
  157. cd ..
  158. mv build non-sse
  159. @@ -91,14 +112,33 @@
  160. %endif
  161.  
  162. #build sse flavour
  163. -%cmake -DWITH_INSTALL_PORTABLE=OFF -DWITH_PLAYER=ON \
  164. - -DWITH_PYTHON=ON -DWITH_PYTHON_INSTALL=OFF \
  165. - -DPYTHON_VERSION=%{py3ver} -DWITH_BUILTIN_GLEW=OFF \
  166. - -DWITH_CODEC_FFMPEG=ON -DWITH_CODEC_SNDFILE=ON \
  167. +%cmake \
  168. + -DCMAKE_SKIP_RPATH=ON \
  169. + -DBUILD_SHARED_LIBS=OFF \
  170. + -DWITH_INSTALL_PORTABLE=OFF \
  171. + -DWITH_GAMEENGINE:BOOL=ON \
  172. + -DWITH_PLAYER:BOOL=ON \
  173. + -DWITH_PYTHON:BOOL=ON \
  174. + -DPYTHON_VERSION:STRING=%{py3_ver} \
  175. + -DWITH_PYTHON_INSTALL:BOOL=OFF \
  176. + -DWITH_BUILTIN_GLEW:BOOL=OFF \
  177. + -DWITH_CODEC_FFMPEG:BOOL=ON \
  178. + -DWITH_CODEC_SNDFILE:BOOL=ON \
  179. + -DWITH_IMAGE_OPENJPEG:BOOL=ON \
  180. + -DWITH_OPENCOLLADA:BOOL=ON \
  181. + -DOPENCOLLADA=%{_includedir} \
  182. + -DWITH_FFTW3:BOOL=ON \
  183. + -DWITH_MOD_OCEANSIM:BOOL=ON \
  184. + -DWITH_CYCLES:BOOL=ON \
  185. + -DWITH_CXX_GUARDEDALLOC:BOOL=OFF \
  186. + -DWITH_MEM_JEMALLOC:BOOL=ON \
  187. + -DWITH_OPENCOLORIO:BOOL=ON \
  188. + -DWITH_DOC_MANPAGE:BOOL=ON \
  189. %ifarch %{ix86}
  190. -DSUPPORT_SSE2_BUILD=OFF \
  191. %endif
  192. - -DWITH_RAYOPTIMIZATION=ON -DWITH_JACK_DYNLOAD=ON
  193. + -DWITH_RAYOPTIMIZATION:BOOL=ON \
  194. + -DWITH_JACK:BOOL=ON
  195. %make
  196.  
  197. %install
  198. @@ -117,13 +157,13 @@
  199. %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
  200.  
  201. %ifarch %{ix86}
  202. -mv %buildroot%_bindir/%name %buildroot%_bindir/%name.sse
  203. +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.sse
  204.  
  205. #install non-sse flavour
  206. rm -fr build
  207. mv non-sse build
  208. %makeinstall_std -C build
  209. -mv %buildroot%_bindir/%name %buildroot%_bindir/%name.nonsse
  210. +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}.nonsse
  211.  
  212. # install wrapper
  213. cat >> %{buildroot}%{_bindir}/blender <<EOF
  214. @@ -142,7 +182,7 @@
  215.  
  216. sed -i -e 's,#!/usr/bin/python,#!/usr/bin/python3,' %{buildroot}%{_bindir}/blender-thumbnailer.py %{buildroot}%{_datadir}/%{name}/*/scripts/modules/blend_render_info.py
  217.  
  218. -%find_lang %name
  219. +%find_lang %{name}
  220.  
  221. %post
  222. if [ -x %{_gconftool_bin} ]; then
  223. @@ -156,10 +196,10 @@
  224. %{_gconftool_bin} --direct --config-source xml:readwrite:%{_sysconfdir}/gconf/gconf.xml.defaults --unset /desktop/gnome/thumbnailers/application@x-blender/command
  225. fi
  226.  
  227. -%files -f %name.lang
  228. +%files -f %{name}.lang
  229. %doc release/text/*
  230. %{_bindir}/*
  231. %{_datadir}/applications/*.desktop
  232. -%{_datadir}/%{name}
  233. +%{_datadir}/%{name}/
  234. %{_mandir}/man1/%{name}.1.*
  235. %{_iconsdir}/hicolor/*/apps/%{name}.*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!