Date: Wednesday, August 5, 2015 @ 12:22:59 Author: spupykin Revision: 137977
archrelease: copy trunk to community-i686, community-x86_64 Added: openscenegraph/repos/community-i686/PKGBUILD (from rev 137976, openscenegraph/trunk/PKGBUILD) openscenegraph/repos/community-i686/giflib.patch (from rev 137976, openscenegraph/trunk/giflib.patch) openscenegraph/repos/community-x86_64/PKGBUILD (from rev 137976, openscenegraph/trunk/PKGBUILD) openscenegraph/repos/community-x86_64/giflib.patch (from rev 137976, openscenegraph/trunk/giflib.patch) Deleted: openscenegraph/repos/community-i686/PKGBUILD openscenegraph/repos/community-i686/giflib.patch openscenegraph/repos/community-x86_64/PKGBUILD openscenegraph/repos/community-x86_64/giflib.patch -------------------------------+ /PKGBUILD | 124 ++++++++++++++++++++++++++++++++++++++++ /giflib.patch | 24 +++++++ community-i686/PKGBUILD | 62 -------------------- community-i686/giflib.patch | 12 --- community-x86_64/PKGBUILD | 62 -------------------- community-x86_64/giflib.patch | 12 --- 6 files changed, 148 insertions(+), 148 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-08-05 10:22:47 UTC (rev 137976) +++ community-i686/PKGBUILD 2015-08-05 10:22:59 UTC (rev 137977) @@ -1,62 +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.2.1 -pkgrel=5 -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://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip - https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch - giflib.patch) -md5sums=('4f95206a1eef218bd007c3b43e1334f5' - '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-i686/PKGBUILD (from rev 137976, openscenegraph/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-08-05 10:22:59 UTC (rev 137977) @@ -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.2 +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://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip + https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch + giflib.patch) +md5sums=('caa21fe5a1250806ddd372d8b7352b5f' + '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 +} Deleted: community-i686/giflib.patch =================================================================== --- community-i686/giflib.patch 2015-08-05 10:22:47 UTC (rev 137976) +++ community-i686/giflib.patch 2015-08-05 10:22:59 UTC (rev 137977) @@ -1,12 +0,0 @@ -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; - } - Copied: openscenegraph/repos/community-i686/giflib.patch (from rev 137976, openscenegraph/trunk/giflib.patch) =================================================================== --- community-i686/giflib.patch (rev 0) +++ community-i686/giflib.patch 2015-08-05 10:22:59 UTC (rev 137977) @@ -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-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-08-05 10:22:47 UTC (rev 137976) +++ community-x86_64/PKGBUILD 2015-08-05 10:22:59 UTC (rev 137977) @@ -1,62 +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.2.1 -pkgrel=5 -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://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip - https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch - giflib.patch) -md5sums=('4f95206a1eef218bd007c3b43e1334f5' - '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-x86_64/PKGBUILD (from rev 137976, openscenegraph/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-08-05 10:22:59 UTC (rev 137977) @@ -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.2 +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://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip + https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch + giflib.patch) +md5sums=('caa21fe5a1250806ddd372d8b7352b5f' + '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 +} Deleted: community-x86_64/giflib.patch =================================================================== --- community-x86_64/giflib.patch 2015-08-05 10:22:47 UTC (rev 137976) +++ community-x86_64/giflib.patch 2015-08-05 10:22:59 UTC (rev 137977) @@ -1,12 +0,0 @@ -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; - } - Copied: openscenegraph/repos/community-x86_64/giflib.patch (from rev 137976, openscenegraph/trunk/giflib.patch) =================================================================== --- community-x86_64/giflib.patch (rev 0) +++ community-x86_64/giflib.patch 2015-08-05 10:22:59 UTC (rev 137977) @@ -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; + } +