blender in main close #224

opencv rebuild close #415

multimedia/editor/blender/pspec.xml

@@ -15,35 +15,35 @@
         <Description>blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback.</Description>
         <Archive sha1sum="7b376321ab755ef5a77daee62de2ee7b5947e7ac" type="targz">http://download.blender.org/source/blender-2.75a.tar.gz</Archive>
         <BuildDependencies>
- 	    <Dependency>cmake</Dependency> -->
-            <Dependency>freetype-devel</Dependency>
-            <Dependency>tiff-devel</Dependency>
-            <Dependency>libjpeg-turbo-devel</Dependency>
-            <Dependency>glew-devel</Dependency>
-            <Dependency>mesa-devel</Dependency>
-            <Dependency>libXi-devel</Dependency>
             <Dependency>boost-devel</Dependency>
-            <Dependency>openal-devel</Dependency>
+            <Dependency>cmake</Dependency> -->
-            <Dependency>libsdl-devel</Dependency>
-            <Dependency>libgomp</Dependency>
-            <Dependency>python3-devel</Dependency>
-            <Dependency>ilmbase-devel</Dependency>
-            <Dependency>mesa-glu-devel</Dependency>
-            <Dependency>openjpeg-devel</Dependency>
-            <Dependency>libspnav-devel</Dependency>
-            <Dependency>libXxf86vm-devel</Dependency>
-            <Dependency releaseFrom="7">openimageio-devel</Dependency>
-            <Dependency>openexr-devel</Dependency>
-            <Dependency>libsndfile-devel</Dependency>
             <Dependency>ffmpeg-devel</Dependency>
-            <Dependency>icu4c-devel</Dependency>
-            <Dependency>webp-devel</Dependency>
             <Dependency>fftw3-devel</Dependency>
-            <Dependency>jack-audio-connection-kit-devel</Dependency>
-            <Dependency>zlib-devel</Dependency>
-            <Dependency>libX11-devel</Dependency>
-            <Dependency>libpng-devel</Dependency>
             <Dependency>freetype-devel</Dependency>
+            <Dependency>glew-devel</Dependency>
+            <Dependency>icu4c-devel</Dependency>
+            <Dependency>ilmbase-devel</Dependency>
+            <Dependency>jack-audio-connection-kit-devel</Dependency>
+            <Dependency>libdc1394-devel</Dependency>
+            <Dependency>libgomp</Dependency>
+            <Dependency>libjpeg-turbo-devel</Dependency>
+            <Dependency>libpng-devel</Dependency>
+            <Dependency>libsdl-devel</Dependency>
+            <Dependency>libsndfile-devel</Dependency>
+            <Dependency>libspnav-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libXi-devel</Dependency>
+            <Dependency>libXxf86vm-devel</Dependency>
+            <Dependency>mesa-devel</Dependency>
+            <Dependency>mesa-glu-devel</Dependency>
+            <Dependency>openal-devel</Dependency>
+            <Dependency>openexr-devel</Dependency>
+            <Dependency>openjpeg-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
+            <Dependency>tiff-devel</Dependency>
+            <Dependency versionFrom="1.5.19">openimageio-devel</Dependency>
+            <Dependency>webp-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--<Patch level="1">blender-2.67b-rna.patch</Patch>-->
@@ -54,32 +54,33 @@
     <Package>
         <Name>blender</Name>
         <RuntimeDependencies>
-            <Dependency>tiff</Dependency>
-            <Dependency>libjpeg-turbo</Dependency>
-            <Dependency>glew</Dependency>
-            <Dependency>mesa</Dependency>
-            <Dependency>libXi</Dependency>
             <Dependency>boost</Dependency>
-            <Dependency>openal</Dependency>
-            <Dependency>libsdl</Dependency>
-            <Dependency>libgomp</Dependency>
-            <Dependency>python3</Dependency>
-            <Dependency>ilmbase</Dependency>
-            <Dependency>mesa-glu</Dependency>
-            <Dependency>openjpeg</Dependency>
-            <Dependency>libspnav</Dependency>
-            <Dependency>libXxf86vm</Dependency>
-            <Dependency releaseFrom="7">openimageio</Dependency>
-            <Dependency>openexr-libs</Dependency>
-            <Dependency>libsndfile</Dependency>
             <Dependency>ffmpeg</Dependency>
             <Dependency>fftw3</Dependency>
-            <Dependency>jack-audio-connection-kit</Dependency>
-            <Dependency>zlib</Dependency>
-            <Dependency>libX11</Dependency>
-            <Dependency>libgcc</Dependency>
-            <Dependency>libpng</Dependency>
             <Dependency>freetype</Dependency>
+            <Dependency>glew</Dependency>
+            <Dependency>ilmbase</Dependency>
+            <Dependency>jack-audio-connection-kit</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libdc1394</Dependency>
+            <Dependency>libgomp</Dependency>
+            <Dependency>libjpeg-turbo</Dependency>
+            <Dependency>libpng</Dependency>
+            <Dependency>libsdl</Dependency>
+            <Dependency>libsndfile</Dependency>
+            <Dependency>libspnav</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libXi</Dependency>
+            <Dependency>libXxf86vm</Dependency>
+            <Dependency>mesa</Dependency>
+            <Dependency>mesa-glu</Dependency>
+            <Dependency>openal</Dependency>
+            <Dependency>openexr-libs</Dependency>
+            <Dependency>openjpeg</Dependency>
+            <Dependency>python3</Dependency>
+            <Dependency>tiff</Dependency>
+            <Dependency versionFrom="1.5.19">openimageio</Dependency>
+            <Dependency>zlib</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>

multimedia/graphics/openimageio/pspec.xml

@@ -75,7 +75,7 @@
             <Dependency>giflib-devel</Dependency>
             <Dependency>ilmbase-devel</Dependency>
             <Dependency>openjpeg-devel</Dependency>
-            <Dependency>openexr-libs-devel</Dependency>
+            <Dependency>openexr-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>libraw-devel</Dependency>
             <Dependency>zlib-devel</Dependency>

multimedia/misc/libspnav/actions.py

@@ -9,16 +9,19 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def setup():
-    autotools.configure("--enable-opt --enable-ldopt")
+    autotools.configure("--prefix=/usr \
+                         --disable-debug")
     
 def build():
     autotools.make()
 
 def install():
-    pisitools.insinto("/usr/lib/", "*.so*")
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    pisitools.dosym("libspnav.so.0.1", "/usr/lib/libspnav.so.0")
+    
-    pisitools.domove("/usr/lib/libspnav.so.0.1", "/usr/lib", "libspnav.so")
+    #pisitools.insinto("/usr/lib/", "*.so*")
-    pisitools.insinto("/usr/lib/", "*.so*")
+    #pisitools.dosym("libspnav.so.0.1", "/usr/lib/libspnav.so.0")
-    pisitools.insinto("/usr/include/", "*.h")
+    #pisitools.domove("/usr/lib/libspnav.so.0.1", "/usr/lib", "libspnav.so")
+    #pisitools.insinto("/usr/lib/", "*.so*")
+    #pisitools.insinto("/usr/include/", "*.h")
 
     pisitools.dodoc("README")

multimedia/misc/libspnav/files/Makefile.patch

@@ -0,0 +1,13 @@
+--- libspnav-0.2.3/Makefile.in~	2015-01-10 09:08:35.043417955 +0000
++++ libspnav-0.2.3/Makefile.in	2015-01-10 09:09:00.833315269 +0000
+@@ -54,8 +54,8 @@
+ 	cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so)
+ 	[ -n "$(soname)" ] && \
+ 		rm -f $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) && \
+-		ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
+-		ln -s $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
++		ln -s $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(soname) && \
++		ln -s $(soname) $(DESTDIR)$(PREFIX)/$(libdir)/$(devlink) || \
+ 		true
+ 	for h in $(hdr); do cp -p $(srcdir)/$$h $(DESTDIR)$(PREFIX)/include/; done
+ 

multimedia/misc/libspnav/pspec.xml

@@ -12,13 +12,13 @@
         <IsA>library</IsA>
         <Summary>Open source alternative to 3DConnextion drivers</Summary>
         <Description>The spacenav project provides a free compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 6dof space navigation input devices. It provides both a replacement free user-space driver, and a replacement SDK library.</Description>
-        <Archive sha1sum="c9291ed4acb38da3be4f81e6e3b43f853ce55eca" type="targz">http://sourceforge.net/projects/spacenav/files/spacenav%20library%20%28SDK%29/libspnav%200.2.2/libspnav-0.2.2.tar.gz</Archive>
+        <Archive sha1sum="e308344cc2c86bb3f01cca308261a35aaa8c6318" type="targz">http://downloads.sourceforge.net/spacenav/libspnav-0.2.3.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>libX11-devel</Dependency>
         </BuildDependencies>
         <Patches>
-          <Patch level="1">libspnav-0.2.2-custom-flags.patch</Patch>
+          <!--Patch level="1">libspnav-0.2.2-custom-flags.patch</Patch-->
-          <Patch level="1">libspnav-0.2.2-makefile.patch</Patch>
+          <Patch>Makefile.patch</Patch>
         </Patches>
     </Source>
 
@@ -46,6 +46,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2015-09-16</Date>
+            <Version>0.2.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="4">
             <Date>2014-05-25</Date>
             <Version>0.2.2</Version>