From 0ed83197959d8e3566554edb1dde1bbc36aeeae4 Mon Sep 17 00:00:00 2001 From: ertugerata Date: Wed, 16 Sep 2015 10:59:50 +0300 Subject: [PATCH] blender in main close #224 opencv rebuild close #415 --- multimedia/editor/blender/pspec.xml | 95 ++++++++++--------- multimedia/graphics/openimageio/pspec.xml | 2 +- multimedia/misc/libspnav/actions.py | 15 +-- multimedia/misc/libspnav/files/Makefile.patch | 13 +++ multimedia/misc/libspnav/pspec.xml | 15 ++- 5 files changed, 82 insertions(+), 58 deletions(-) create mode 100644 multimedia/misc/libspnav/files/Makefile.patch diff --git a/multimedia/editor/blender/pspec.xml b/multimedia/editor/blender/pspec.xml index a362c4fb49..658e83207d 100644 --- a/multimedia/editor/blender/pspec.xml +++ b/multimedia/editor/blender/pspec.xml @@ -15,35 +15,35 @@ blender is the essential software solution you need for 3D, from modeling, animation, rendering and post-production to interactive creation and playback. http://download.blender.org/source/blender-2.75a.tar.gz - cmake --> - freetype-devel - tiff-devel - libjpeg-turbo-devel - glew-devel - mesa-devel - libXi-devel boost-devel - openal-devel - libsdl-devel - libgomp - python3-devel - ilmbase-devel - mesa-glu-devel - openjpeg-devel - libspnav-devel - libXxf86vm-devel - openimageio-devel - openexr-devel - libsndfile-devel + cmake --> ffmpeg-devel - icu4c-devel - webp-devel fftw3-devel - jack-audio-connection-kit-devel - zlib-devel - libX11-devel - libpng-devel freetype-devel + glew-devel + icu4c-devel + ilmbase-devel + jack-audio-connection-kit-devel + libdc1394-devel + libgomp + libjpeg-turbo-devel + libpng-devel + libsdl-devel + libsndfile-devel + libspnav-devel + libX11-devel + libXi-devel + libXxf86vm-devel + mesa-devel + mesa-glu-devel + openal-devel + openexr-devel + openjpeg-devel + python3-devel + tiff-devel + openimageio-devel + webp-devel + zlib-devel @@ -54,32 +54,33 @@ blender - tiff - libjpeg-turbo - glew - mesa - libXi boost - openal - libsdl - libgomp - python3 - ilmbase - mesa-glu - openjpeg - libspnav - libXxf86vm - openimageio - openexr-libs - libsndfile ffmpeg fftw3 - jack-audio-connection-kit - zlib - libX11 - libgcc - libpng freetype + glew + ilmbase + jack-audio-connection-kit + libgcc + libdc1394 + libgomp + libjpeg-turbo + libpng + libsdl + libsndfile + libspnav + libX11 + libXi + libXxf86vm + mesa + mesa-glu + openal + openexr-libs + openjpeg + python3 + tiff + openimageio + zlib /usr/bin diff --git a/multimedia/graphics/openimageio/pspec.xml b/multimedia/graphics/openimageio/pspec.xml index 2c2e898043..ea923ccc36 100644 --- a/multimedia/graphics/openimageio/pspec.xml +++ b/multimedia/graphics/openimageio/pspec.xml @@ -75,7 +75,7 @@ giflib-devel ilmbase-devel openjpeg-devel - openexr-libs-devel + openexr-devel libjpeg-turbo-devel libraw-devel zlib-devel diff --git a/multimedia/misc/libspnav/actions.py b/multimedia/misc/libspnav/actions.py index 2a1bc8b5c4..b82682f533 100644 --- a/multimedia/misc/libspnav/actions.py +++ b/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*") - 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/include/", "*.h") + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + #pisitools.insinto("/usr/lib/", "*.so*") + #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/include/", "*.h") pisitools.dodoc("README") \ No newline at end of file diff --git a/multimedia/misc/libspnav/files/Makefile.patch b/multimedia/misc/libspnav/files/Makefile.patch new file mode 100644 index 0000000000..28b1033407 --- /dev/null +++ b/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 + diff --git a/multimedia/misc/libspnav/pspec.xml b/multimedia/misc/libspnav/pspec.xml index dac38366be..e9f246db6f 100644 --- a/multimedia/misc/libspnav/pspec.xml +++ b/multimedia/misc/libspnav/pspec.xml @@ -12,13 +12,13 @@ library Open source alternative to 3DConnextion drivers 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. - http://sourceforge.net/projects/spacenav/files/spacenav%20library%20%28SDK%29/libspnav%200.2.2/libspnav-0.2.2.tar.gz + http://downloads.sourceforge.net/spacenav/libspnav-0.2.3.tar.gz libX11-devel - libspnav-0.2.2-custom-flags.patch - libspnav-0.2.2-makefile.patch + + Makefile.patch @@ -46,6 +46,13 @@ + + 2015-09-16 + 0.2.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + 2014-05-25 0.2.2 @@ -75,4 +82,4 @@ osman.erkan@pisilinux.org - \ No newline at end of file +