Date: Thursday, July 25, 2013 @ 12:41:28
Author: spupykin
Revision: 94454
archrelease: copy trunk to community-i686, community-x86_64
Added:
openscenegraph/repos/community-i686/PKGBUILD
(from rev 94453, openscenegraph/trunk/PKGBUILD)
openscenegraph/repos/community-i686/osg-xine-1.2.patch
(from rev 94453, openscenegraph/trunk/osg-xine-1.2.patch)
openscenegraph/repos/community-x86_64/PKGBUILD
(from rev 94453, openscenegraph/trunk/PKGBUILD)
openscenegraph/repos/community-x86_64/osg-xine-1.2.patch
(from rev 94453, openscenegraph/trunk/osg-xine-1.2.patch)
Modified:
openscenegraph/trunk/PKGBUILD
Deleted:
openscenegraph/repos/community-i686/PKGBUILD
openscenegraph/repos/community-i686/osg-xine-1.2.patch
openscenegraph/repos/community-x86_64/PKGBUILD
openscenegraph/repos/community-x86_64/osg-xine-1.2.patch
-------------------------------------------+
/community-i686/PKGBUILD | 52 ++++++++++++++++++++++++++
/community-i686/osg-xine-1.2.patch | 14 +++++++
/community-x86_64/PKGBUILD | 52 ++++++++++++++++++++++++++
/community-x86_64/osg-xine-1.2.patch | 14 +++++++
repos/community-i686/PKGBUILD | 55 ----------------------------
repos/community-i686/osg-xine-1.2.patch | 14 -------
repos/community-x86_64/PKGBUILD | 55 ----------------------------
repos/community-x86_64/osg-xine-1.2.patch | 14 -------
trunk/PKGBUILD | 2 -
9 files changed, 133 insertions(+), 139 deletions(-)
Deleted: repos/community-i686/PKGBUILD
===================================================================
--- repos/community-i686/PKGBUILD 2013-07-25 10:41:09 UTC (rev 94453)
+++ repos/community-i686/PKGBUILD 2013-07-25 10:41:28 UTC (rev 94454)
@@ -1,55 +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.0.1
-pkgrel=10
-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
- osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip";)
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
- 'b05a486fdc2aaf06b29efb5e0714672e')
-
-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
- patch -p1 <$srcdir/osg-xine-1.2.patch
- 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 94453,
openscenegraph/trunk/PKGBUILD)
===================================================================
--- repos/community-i686/PKGBUILD (rev 0)
+++ repos/community-i686/PKGBUILD 2013-07-25 10:41:28 UTC (rev 94454)
@@ -0,0 +1,52 @@
+# $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=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)
+md5sums=('4980f8692712a24d4c99f363f80c6814')
+
+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: repos/community-i686/osg-xine-1.2.patch
===================================================================
--- repos/community-i686/osg-xine-1.2.patch 2013-07-25 10:41:09 UTC (rev
94453)
+++ repos/community-i686/osg-xine-1.2.patch 2013-07-25 10:41:28 UTC (rev
94454)
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20
14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- clear(rgb_class, sizeof(rgbout_class_t));
-
- rgb_class->driver_class.open_plugin = open_plugin;
-- rgb_class->driver_class.get_identifier = get_identifier;
-- rgb_class->driver_class.get_description = get_description;
-+ rgb_class->driver_class.identifier = get_identifier(NULL);
-+ rgb_class->driver_class.description = get_description(NULL);
- rgb_class->driver_class.dispose = dispose_class;
-
- return(rgb_class);
Copied: openscenegraph/repos/community-i686/osg-xine-1.2.patch (from rev 94453,
openscenegraph/trunk/osg-xine-1.2.patch)
===================================================================
--- repos/community-i686/osg-xine-1.2.patch (rev 0)
+++ repos/community-i686/osg-xine-1.2.patch 2013-07-25 10:41:28 UTC (rev
94454)
@@ -0,0 +1,14 @@
+diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
+--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20
14:46:20.000000000 +0300
++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
2012-01-05 02:15:38.000000000 +0400
+@@ -2769,8 +2769,8 @@
+ clear(rgb_class, sizeof(rgbout_class_t));
+
+ rgb_class->driver_class.open_plugin = open_plugin;
+- rgb_class->driver_class.get_identifier = get_identifier;
+- rgb_class->driver_class.get_description = get_description;
++ rgb_class->driver_class.identifier = get_identifier(NULL);
++ rgb_class->driver_class.description = get_description(NULL);
+ rgb_class->driver_class.dispose = dispose_class;
+
+ return(rgb_class);
Deleted: repos/community-x86_64/PKGBUILD
===================================================================
--- repos/community-x86_64/PKGBUILD 2013-07-25 10:41:09 UTC (rev 94453)
+++ repos/community-x86_64/PKGBUILD 2013-07-25 10:41:28 UTC (rev 94454)
@@ -1,55 +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.0.1
-pkgrel=10
-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
- osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip";)
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
- 'b05a486fdc2aaf06b29efb5e0714672e')
-
-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
- patch -p1 <$srcdir/osg-xine-1.2.patch
- 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 94453,
openscenegraph/trunk/PKGBUILD)
===================================================================
--- repos/community-x86_64/PKGBUILD (rev 0)
+++ repos/community-x86_64/PKGBUILD 2013-07-25 10:41:28 UTC (rev 94454)
@@ -0,0 +1,52 @@
+# $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=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)
+md5sums=('4980f8692712a24d4c99f363f80c6814')
+
+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: repos/community-x86_64/osg-xine-1.2.patch
===================================================================
--- repos/community-x86_64/osg-xine-1.2.patch 2013-07-25 10:41:09 UTC (rev
94453)
+++ repos/community-x86_64/osg-xine-1.2.patch 2013-07-25 10:41:28 UTC (rev
94454)
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20
14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- clear(rgb_class, sizeof(rgbout_class_t));
-
- rgb_class->driver_class.open_plugin = open_plugin;
-- rgb_class->driver_class.get_identifier = get_identifier;
-- rgb_class->driver_class.get_description = get_description;
-+ rgb_class->driver_class.identifier = get_identifier(NULL);
-+ rgb_class->driver_class.description = get_description(NULL);
- rgb_class->driver_class.dispose = dispose_class;
-
- return(rgb_class);
Copied: openscenegraph/repos/community-x86_64/osg-xine-1.2.patch (from rev
94453, openscenegraph/trunk/osg-xine-1.2.patch)
===================================================================
--- repos/community-x86_64/osg-xine-1.2.patch (rev 0)
+++ repos/community-x86_64/osg-xine-1.2.patch 2013-07-25 10:41:28 UTC (rev
94454)
@@ -0,0 +1,14 @@
+diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c
OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
+--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20
14:46:20.000000000 +0300
++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
2012-01-05 02:15:38.000000000 +0400
+@@ -2769,8 +2769,8 @@
+ clear(rgb_class, sizeof(rgbout_class_t));
+
+ rgb_class->driver_class.open_plugin = open_plugin;
+- rgb_class->driver_class.get_identifier = get_identifier;
+- rgb_class->driver_class.get_description = get_description;
++ rgb_class->driver_class.identifier = get_identifier(NULL);
++ rgb_class->driver_class.description = get_description(NULL);
+ rgb_class->driver_class.dispose = dispose_class;
+
+ return(rgb_class);
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2013-07-25 10:41:09 UTC (rev 94453)
+++ trunk/PKGBUILD 2013-07-25 10:41:28 UTC (rev 94454)
@@ -6,7 +6,7 @@
pkgname=openscenegraph
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="An Open Source, high performance real-time graphics toolkit"
arch=('i686' 'x86_64')
license=('custom:OSGPL')
