Date: Monday, December 7, 2015 @ 11:17:09 Author: foutrelis Revision: 149794
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: openscenegraph/repos/community-staging-i686/PKGBUILD (from rev 149793, openscenegraph/trunk/PKGBUILD) openscenegraph/repos/community-staging-i686/giflib.patch (from rev 149793, openscenegraph/trunk/giflib.patch) openscenegraph/repos/community-staging-x86_64/PKGBUILD (from rev 149793, openscenegraph/trunk/PKGBUILD) openscenegraph/repos/community-staging-x86_64/giflib.patch (from rev 149793, openscenegraph/trunk/giflib.patch) Deleted: openscenegraph/repos/community-staging-i686/PKGBUILD openscenegraph/repos/community-staging-x86_64/PKGBUILD ---------------------------------------+ /PKGBUILD | 124 ++++++++++++++++++++++++++++++++ community-staging-i686/PKGBUILD | 37 --------- community-staging-i686/giflib.patch | 12 +++ community-staging-x86_64/PKGBUILD | 37 --------- community-staging-x86_64/giflib.patch | 12 +++ 5 files changed, 148 insertions(+), 74 deletions(-) Deleted: community-staging-i686/PKGBUILD =================================================================== --- community-staging-i686/PKGBUILD 2015-12-07 10:17:01 UTC (rev 149793) +++ community-staging-i686/PKGBUILD 2015-12-07 10:17:09 UTC (rev 149794) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Hans Janssen <jans...@gmail.com> -# Contributor: my64 <packa...@obordes.com> -# Contributor: Colin Pitrat <colin.pit...@gmail.com> - -pkgname=openscenegraph -pkgver=3.4.0 -pkgrel=2 -pkgdesc="An Open Source, high performance real-time graphics toolkit" -arch=('i686' 'x86_64') -license=('custom:OSGPL') -url="http://www.openscenegraph.org" -depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg' 'mesa') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg') -conflicts=('openthreads') -provides=('openthreads') -source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip) -md5sums=('a5e762c64373a46932e444f6f7332496') - -build() { - cd OpenSceneGraph-$pkgver - CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" - CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - [ $NOEXTRACT -eq 1 ] || cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true -} Copied: openscenegraph/repos/community-staging-i686/PKGBUILD (from rev 149793, openscenegraph/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-12-07 10:17:09 UTC (rev 149794) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Hans Janssen <jans...@gmail.com> +# Contributor: my64 <packa...@obordes.com> +# Contributor: Colin Pitrat <colin.pit...@gmail.com> + +pkgname=openscenegraph +pkgver=3.2.3 +pkgrel=1 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg-compat' 'mesa') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg-compat') +conflicts=('openthreads') +provides=('openthreads') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip +source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip + https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch + giflib.patch) +md5sums=('02ffdad7744c747d8fad0d7babb58427' + '6e3c75677f87113f18912916352c6cbd' + '8c06c8410e8840e83c242b8b401cdad7') + +prepare() { + cd OpenSceneGraph-$pkgver +# patch -p1 <$srcdir/giflib.patch +# patch -p1 <$srcdir/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch +} + +build() { + cd OpenSceneGraph-$pkgver + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" + [ $NOEXTRACT -eq 1 ] || cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \ + -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \ + -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \ + -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \ + -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so + +# sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} Copied: openscenegraph/repos/community-staging-i686/giflib.patch (from rev 149793, openscenegraph/trunk/giflib.patch) =================================================================== --- community-staging-i686/giflib.patch (rev 0) +++ community-staging-i686/giflib.patch 2015-12-07 10:17:09 UTC (rev 149794) @@ -0,0 +1,12 @@ +diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp +--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400 ++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400 +@@ -561,7 +561,7 @@ + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; +- DGifCloseFile(giffile); ++ DGifCloseFile(giffile, NULL); + return buffer; + } + Deleted: community-staging-x86_64/PKGBUILD =================================================================== --- community-staging-x86_64/PKGBUILD 2015-12-07 10:17:01 UTC (rev 149793) +++ community-staging-x86_64/PKGBUILD 2015-12-07 10:17:09 UTC (rev 149794) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Hans Janssen <jans...@gmail.com> -# Contributor: my64 <packa...@obordes.com> -# Contributor: Colin Pitrat <colin.pit...@gmail.com> - -pkgname=openscenegraph -pkgver=3.4.0 -pkgrel=2 -pkgdesc="An Open Source, high performance real-time graphics toolkit" -arch=('i686' 'x86_64') -license=('custom:OSGPL') -url="http://www.openscenegraph.org" -depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg' 'mesa') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg') -conflicts=('openthreads') -provides=('openthreads') -source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip) -md5sums=('a5e762c64373a46932e444f6f7332496') - -build() { - cd OpenSceneGraph-$pkgver - CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" - CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - [ $NOEXTRACT -eq 1 ] || cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true -} Copied: openscenegraph/repos/community-staging-x86_64/PKGBUILD (from rev 149793, openscenegraph/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-12-07 10:17:09 UTC (rev 149794) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Hans Janssen <jans...@gmail.com> +# Contributor: my64 <packa...@obordes.com> +# Contributor: Colin Pitrat <colin.pit...@gmail.com> + +pkgname=openscenegraph +pkgver=3.2.3 +pkgrel=1 +pkgdesc="An Open Source, high performance real-time graphics toolkit" +arch=('i686' 'x86_64') +license=('custom:OSGPL') +url="http://www.openscenegraph.org" +depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') +makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg-compat' 'mesa') +optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg-compat') +conflicts=('openthreads') +provides=('openthreads') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip +source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip + https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch + giflib.patch) +md5sums=('02ffdad7744c747d8fad0d7babb58427' + '6e3c75677f87113f18912916352c6cbd' + '8c06c8410e8840e83c242b8b401cdad7') + +prepare() { + cd OpenSceneGraph-$pkgver +# patch -p1 <$srcdir/giflib.patch +# patch -p1 <$srcdir/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch +} + +build() { + cd OpenSceneGraph-$pkgver + export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" + CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" + CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" + [ $NOEXTRACT -eq 1 ] || cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \ + -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \ + -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \ + -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \ + -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ + -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so + +# sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp + make +} + +package() { + cd OpenSceneGraph-$pkgver + make DESTDIR="$pkgdir" install + install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true +} Copied: openscenegraph/repos/community-staging-x86_64/giflib.patch (from rev 149793, openscenegraph/trunk/giflib.patch) =================================================================== --- community-staging-x86_64/giflib.patch (rev 0) +++ community-staging-x86_64/giflib.patch 2015-12-07 10:17:09 UTC (rev 149794) @@ -0,0 +1,12 @@ +diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp +--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400 ++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400 +@@ -561,7 +561,7 @@ + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; +- DGifCloseFile(giffile); ++ DGifCloseFile(giffile, NULL); + return buffer; + } +