Date: Monday, July 7, 2014 @ 11:39:41
Author: spupykin
Revision: 115274
archrelease: copy trunk to community-x86_64
Added:
openscenegraph/repos/community-x86_64/PKGBUILD
(from rev 115273, openscenegraph/trunk/PKGBUILD)
openscenegraph/repos/community-x86_64/giflib.patch
(from rev 115273, openscenegraph/trunk/giflib.patch)
Deleted:
openscenegraph/repos/community-x86_64/PKGBUILD
openscenegraph/repos/community-x86_64/giflib.patch
--------------+
PKGBUILD | 118 ++++++++++++++++++++++++++++-----------------------------
giflib.patch | 24 +++++------
2 files changed, 71 insertions(+), 71 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-07 09:30:48 UTC (rev 115273)
+++ PKGBUILD 2014-07-07 09:39:41 UTC (rev 115274)
@@ -1,59 +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.0
-pkgrel=4
-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' 'qt4' 'ffmpeg-compat' 'mesa')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4')
-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
- giflib.patch)
-md5sums=('4980f8692712a24d4c99f363f80c6814'
- '8c06c8410e8840e83c242b8b401cdad7')
-
-prepare() {
- cd OpenSceneGraph-$pkgver
- patch -p1 <$srcdir/giflib.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 115273,
openscenegraph/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-07-07 09:39:41 UTC (rev 115274)
@@ -0,0 +1,59 @@
+# $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=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' 'qt4' 'ffmpeg-compat' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4')
+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
+ giflib.patch)
+md5sums=('4f95206a1eef218bd007c3b43e1334f5'
+ '8c06c8410e8840e83c242b8b401cdad7')
+
+prepare() {
+ cd OpenSceneGraph-$pkgver
+ patch -p1 <$srcdir/giflib.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: giflib.patch
===================================================================
--- giflib.patch 2014-07-07 09:30:48 UTC (rev 115273)
+++ giflib.patch 2014-07-07 09:39:41 UTC (rev 115274)
@@ -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 115273,
openscenegraph/trunk/giflib.patch)
===================================================================
--- giflib.patch (rev 0)
+++ giflib.patch 2014-07-07 09:39:41 UTC (rev 115274)
@@ -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;
+ }
+
