diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-13 14:21:34 -0300 |
| commit | 4a47b2a0e019de14d474e353a601ca6bf47e90e5 (patch) | |
| tree | 69e20048be17aa12e6342ebcafb0cf9cdbfee32d /community/openscenegraph | |
| parent | 149750d28420a7b59fab5501ab9aaca095f6fa46 (diff) | |
| parent | b5f690637837ff269bf5d248ee2dc37ea5236ca8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/packagekit/PKGBUILD
community/bird/PKGBUILD
community/camlp5/PKGBUILD
community/exim/PKGBUILD
community/ibus-table-extraphrase/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/torcs/PKGBUILD
core/db/PKGBUILD
core/iproute2/PKGBUILD
core/libsasl/PKGBUILD
core/openldap/PKGBUILD
core/pam/PKGBUILD
core/util-linux/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/kdelibs/PKGBUILD
extra/libreoffice/PKGBUILD
extra/php/PKGBUILD
extra/postfix/PKGBUILD
extra/python-lxml/PKGBUILD
extra/rdesktop/PKGBUILD
extra/redland/PKGBUILD
extra/subversion/PKGBUILD
extra/tidyhtml/PKGBUILD
extra/transmission/PKGBUILD
extra/windowmaker/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-openssl/PKGBUILD
Diffstat (limited to 'community/openscenegraph')
| -rw-r--r-- | community/openscenegraph/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/openscenegraph/osg-xine-1.2.patch | 14 |
2 files changed, 21 insertions, 4 deletions
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index dedf985b9..3b8f76894 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58415 2011-11-12 17:18:19Z ibiru $ +# $Id: PKGBUILD 61921 2012-01-10 23:41:50Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') license=('custom:OSGPL') @@ -16,14 +16,17 @@ makedepends=('cmake' 'libvncserver') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip) +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') +md5sums=('c43a25d023e635c3566b2083d8e6d956' + 'b05a486fdc2aaf06b29efb5e0714672e') build() { cd OpenSceneGraph-$pkgver [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release 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 } diff --git a/community/openscenegraph/osg-xine-1.2.patch b/community/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community/openscenegraph/osg-xine-1.2.patch @@ -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); |