[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2020-03-18 Thread Sven-Hendrik Haase via arch-commits
Date: Wednesday, March 18, 2020 @ 20:32:36
  Author: svenstaro
Revision: 600687

upgpkg: openscenegraph 3.6.5-1

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-18 20:18:45 UTC (rev 600686)
+++ PKGBUILD2020-03-18 20:32:36 UTC (rev 600687)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.6.4
+pkgver=3.6.5
 pkgrel=1
 pkgdesc='Open Source, high performance real-time graphics toolkit'
 url='http://www.openscenegraph.org'
@@ -17,8 +17,8 @@
 conflicts=('openthreads')
 provides=('openthreads')
 
source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz)
-sha256sums=('81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33')
-sha512sums=('7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19')
+sha256sums=('aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12')
+sha512sums=('7002fa30a3bcf6551d2e1050b4ca75a3736013fd190e4f50953717406864da1952deb09f530bc8c5ddf6e4b90204baec7dbc283f497829846d46d561f66feb4b')
 
 build() {
   mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build
@@ -28,7 +28,7 @@
 -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_LIBDIR=lib \
   ..
-  make
+  VERBOSE=1 make
 }
 
 package() {


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2019-08-07 Thread Levente Polyak via arch-commits
Date: Wednesday, August 7, 2019 @ 21:55:41
  Author: anthraxx
Revision: 498260

upgpkg: openscenegraph 3.6.4-1

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-07 21:50:19 UTC (rev 498259)
+++ PKGBUILD2019-08-07 21:55:41 UTC (rev 498260)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=1
 pkgdesc='Open Source, high performance real-time graphics toolkit'
 url='http://www.openscenegraph.org'
@@ -17,8 +17,8 @@
 conflicts=('openthreads')
 provides=('openthreads')
 
source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz)
-sha256sums=('51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696')
-sha512sums=('5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322')
+sha256sums=('81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33')
+sha512sums=('7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19')
 
 build() {
   mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build
@@ -35,7 +35,6 @@
   cd OpenSceneGraph-OpenSceneGraph-${pkgver}
   make -C build DESTDIR="${pkgdir}" install
   install -Dm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
 }
 
 # vim: ts=2 sw=2 et:


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD openscenegraph-ffmpeg3.patch)

2018-10-02 Thread Levente Polyak via arch-commits
Date: Tuesday, October 2, 2018 @ 14:47:00
  Author: anthraxx
Revision: 389004

upgpkg: openscenegraph 3.6.3-1

Modified:
  openscenegraph/trunk/PKGBUILD
Deleted:
  openscenegraph/trunk/openscenegraph-ffmpeg3.patch

--+
 PKGBUILD |   20 ++---
 openscenegraph-ffmpeg3.patch |  157 -
 2 files changed, 9 insertions(+), 168 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-02 12:29:54 UTC (rev 389003)
+++ PKGBUILD2018-10-02 14:47:00 UTC (rev 389004)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.4.1
-pkgrel=4
+pkgver=3.6.3
+pkgrel=1
 pkgdesc='Open Source, high performance real-time graphics toolkit'
 url='http://www.openscenegraph.org'
 arch=('x86_64')
@@ -17,26 +17,24 @@
 conflicts=('openthreads')
 provides=('openthreads')
 
source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz)
-sha256sums=('930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5')
-sha512sums=('4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143')
+sha256sums=('51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696')
+sha512sums=('5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322')
 
-prepare() {
+build() {
   mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build
-}
-
-build() {
   cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build
   cmake \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_LIBDIR=lib \
   ..
   make
 }
 
 package() {
-  cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build
-  make DESTDIR="${pkgdir}" install
-  install -Dm 644 ../LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  cd OpenSceneGraph-OpenSceneGraph-${pkgver}
+  make -C build DESTDIR="${pkgdir}" install
+  install -Dm 644 LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
   mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
 }
 

Deleted: openscenegraph-ffmpeg3.patch
===
--- openscenegraph-ffmpeg3.patch2018-10-02 12:29:54 UTC (rev 389003)
+++ openscenegraph-ffmpeg3.patch2018-10-02 14:47:00 UTC (rev 389004)
@@ -1,157 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun 
-Last-Update: <2015-11-02>
-
 
openscenegraph-3.2.1.orig/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
-+++ 
openscenegraph-3.2.1/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
-@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream *
- findAspectRatio();
- 
- // Find out whether we support Alpha channel
--m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
-+m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
- 
- // Find out the framerate
- m_frame_rate = av_q2d(stream->avg_frame_rate);
-@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream *
- throw std::runtime_error("avcodec_open() failed");
- 
- // Allocate video frame
--m_frame.reset(avcodec_alloc_frame());
-+m_frame.reset(av_frame_alloc());
- 
- // Allocate converted RGB frame
--m_frame_rgba.reset(avcodec_alloc_frame());
--m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), 
height()));
-+m_frame_rgba.reset(av_frame_alloc());
-+m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), 
height()));
- m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
- 
- // Assign appropriate parts of the buffer to image planes in m_frame_rgba
--avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
-+avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
- 
- // Override get_buffer()/release_buffer() from codec context in order to 
retrieve the PTS of each frame.
- m_context->opaque = this;
--m_context->get_buffer = getBuffer;
--m_context->release_buffer = releaseBuffer;
-+m_context->get_buffer2 = getBuffer;
- }
- 
- 
-@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur
- #ifdef USE_SWSCALE
- if (m_swscale_ctx==0)
- {
--m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) 
src_pix_fmt,
--  src_width, src_height, (PixelFormat) 
dst_pix_fmt,
-+m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) 
src_pix_fmt,
-+  src_width, src_height, (AVPixelFormat) 
dst_pix_fmt,
-   /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, 
NULL, NULL);
- }
- 
-@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co
- AVPicture * const dst = 

[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2018-09-16 Thread Maxime Gauduin via arch-commits
Date: Sunday, September 16, 2018 @ 18:20:11
  Author: alucryd
Revision: 382217

libavresample drop: openscenegraph 3.4.1-4

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-16 17:00:58 UTC (rev 382216)
+++ PKGBUILD2018-09-16 18:20:11 UTC (rev 382217)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Open Source, high performance real-time graphics toolkit'
 url='http://www.openscenegraph.org'
 arch=('x86_64')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2018-04-28 Thread Maxime Gauduin via arch-commits
Date: Saturday, April 28, 2018 @ 12:00:49
  Author: alucryd
Revision: 318367

ffmpeg 4.0 rebuild: openscenegraph 3.4.1-3

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-28 10:02:30 UTC (rev 318366)
+++ PKGBUILD2018-04-28 12:00:49 UTC (rev 318367)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Open Source, high performance real-time graphics toolkit'
 url='http://www.openscenegraph.org'
 arch=('x86_64')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2018-04-26 Thread Levente Polyak via arch-commits
Date: Thursday, April 26, 2018 @ 07:44:07
  Author: anthraxx
Revision: 318134

upgpkg: openscenegraph 3.4.1-2 (ffmpeg rebuild)

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   42 --
 1 file changed, 20 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-26 07:39:30 UTC (rev 318133)
+++ PKGBUILD2018-04-26 07:44:07 UTC (rev 318134)
@@ -1,45 +1,43 @@
-# $Id$
-# Maintainer: Sergej Pupykin 
-# Maintainer: Hans Janssen 
+# Maintainer: Levente Polyak 
+# Contributor: Sergej Pupykin 
+# Contributor: Hans Janssen 
 # Contributor: my64 
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
 pkgver=3.4.1
-pkgrel=1
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
+pkgrel=2
+pkgdesc='Open Source, high performance real-time graphics toolkit'
+url='http://www.openscenegraph.org'
 arch=('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=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$pkgver.tar.gz
-   openscenegraph-ffmpeg3.patch)
-sha256sums=('930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5'
-'a65fc1ac0538fddb8d11ef1ab2322a782715f8d2b42e0bb01a191212a0612477')
+source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${pkgver}.tar.gz)
+sha256sums=('930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5')
+sha512sums=('4a65625e208d24256b5564bbe9d6f557758b51fae0acf85d1f71968a237fec299088536830fc862d25e02039de9ea13176b298a68aaa644eac958acbe1f4e143')
 
 prepare() {
-  cd OpenSceneGraph-OpenSceneGraph-$pkgver
-  # Fix build with ffmpeg 3.0 (Debian)
-#  patch -p2 -i ../openscenegraph-ffmpeg3.patch
+  mkdir -p OpenSceneGraph-OpenSceneGraph-${pkgver}/build
 }
 
 build() {
-  cd OpenSceneGraph-OpenSceneGraph-$pkgver
-#  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
-#  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-  [ $NOEXTRACT -eq 1 ] || cmake . \
+  cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build
+  cmake \
 -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release
+-DCMAKE_BUILD_TYPE=Release \
+  ..
   make
 }
 
 package() {
-  cd OpenSceneGraph-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
+  cd OpenSceneGraph-OpenSceneGraph-${pkgver}/build
+  make DESTDIR="${pkgdir}" install
+  install -Dm 644 ../LICENSE.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  mv "${pkgdir}/usr/lib64" "${pkgdir}/usr/lib"
 }
+
+# vim: ts=2 sw=2 et:


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2017-09-04 Thread Sergej Pupykin
Date: Monday, September 4, 2017 @ 17:25:43
  Author: spupykin
Revision: 255676

upgpkg: openscenegraph 3.4.1-1

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-04 17:25:34 UTC (rev 255675)
+++ PKGBUILD2017-09-04 17:25:43 UTC (rev 255676)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.4.0
-pkgrel=5
+pkgver=3.4.1
+pkgrel=1
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -16,18 +16,19 @@
 optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg')
 conflicts=('openthreads')
 provides=('openthreads')
-source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip
 openscenegraph-ffmpeg3.patch)
-md5sums=('a5e762c64373a46932e444f6f7332496'
- 'f8151db111ad492ea3bf93971f9a32a9')
+source=(https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$pkgver.tar.gz
+   openscenegraph-ffmpeg3.patch)
+sha256sums=('930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5'
+'a65fc1ac0538fddb8d11ef1ab2322a782715f8d2b42e0bb01a191212a0612477')
 
 prepare() {
-  cd OpenSceneGraph-$pkgver
-# Fix build with ffmpeg 3.0 (Debian)
-  patch -p2 -i ../openscenegraph-ffmpeg3.patch
+  cd OpenSceneGraph-OpenSceneGraph-$pkgver
+  # Fix build with ffmpeg 3.0 (Debian)
+#  patch -p2 -i ../openscenegraph-ffmpeg3.patch
 }
 
 build() {
-  cd OpenSceneGraph-$pkgver
+  cd OpenSceneGraph-OpenSceneGraph-$pkgver
 #  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
 #  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
   [ $NOEXTRACT -eq 1 ] || cmake . \
@@ -37,7 +38,7 @@
 }
 
 package() {
-  cd OpenSceneGraph-$pkgver
+  cd OpenSceneGraph-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


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2017-01-14 Thread Levente Polyak
Date: Saturday, January 14, 2017 @ 19:13:19
  Author: anthraxx
Revision: 207402

upgpkg: openscenegraph 3.4.0-5 (libvncserver rebuild)

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-14 19:06:23 UTC (rev 207401)
+++ PKGBUILD2017-01-14 19:13:19 UTC (rev 207402)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2016-11-22 Thread Levente Polyak
Date: Tuesday, November 22, 2016 @ 19:22:28
  Author: anthraxx
Revision: 196559

upgpkg: openscenegraph 3.4.0-4 (jasper rebuild)

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-22 19:20:32 UTC (rev 196558)
+++ PKGBUILD2016-11-22 19:22:28 UTC (rev 196559)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2016-11-10 Thread Levente Polyak
Date: Thursday, November 10, 2016 @ 17:01:48
  Author: anthraxx
Revision: 195301

upgpkg: openscenegraph 3.4.0-3 (jasper rebuild)

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-10 16:40:57 UTC (rev 195300)
+++ PKGBUILD2016-11-10 17:01:48 UTC (rev 195301)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD openscenegraph-ffmpeg3.patch)

2016-02-18 Thread Antonio Rojas
Date: Thursday, February 18, 2016 @ 23:40:33
  Author: arojas
Revision: 162388

ffmpeg 3.0 rebuild

Added:
  openscenegraph/trunk/openscenegraph-ffmpeg3.patch
Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++-
 openscenegraph-ffmpeg3.patch |  157 +
 2 files changed, 167 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-18 22:39:58 UTC (rev 162387)
+++ PKGBUILD2016-02-18 22:40:33 UTC (rev 162388)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -16,9 +16,16 @@
 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')
+source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip
 openscenegraph-ffmpeg3.patch)
+md5sums=('a5e762c64373a46932e444f6f7332496'
+ 'f8151db111ad492ea3bf93971f9a32a9')
 
+prepare() {
+  cd OpenSceneGraph-$pkgver
+# Fix build with ffmpeg 3.0 (Debian)
+  patch -p2 -i ../openscenegraph-ffmpeg3.patch
+}
+
 build() {
   cd OpenSceneGraph-$pkgver
 #  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"

Added: openscenegraph-ffmpeg3.patch
===
--- openscenegraph-ffmpeg3.patch(rev 0)
+++ openscenegraph-ffmpeg3.patch2016-02-18 22:40:33 UTC (rev 162388)
@@ -0,0 +1,157 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun 
+Last-Update: <2015-11-02>
+
+--- 
openscenegraph-3.2.1.orig/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
 
openscenegraph-3.2.1/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream *
+ findAspectRatio();
+ 
+ // Find out whether we support Alpha channel
+-m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
++m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
+ 
+ // Find out the framerate
+ m_frame_rate = av_q2d(stream->avg_frame_rate);
+@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream *
+ throw std::runtime_error("avcodec_open() failed");
+ 
+ // Allocate video frame
+-m_frame.reset(avcodec_alloc_frame());
++m_frame.reset(av_frame_alloc());
+ 
+ // Allocate converted RGB frame
+-m_frame_rgba.reset(avcodec_alloc_frame());
+-m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), 
height()));
++m_frame_rgba.reset(av_frame_alloc());
++m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), 
height()));
+ m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
+ 
+ // Assign appropriate parts of the buffer to image planes in m_frame_rgba
+-avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
++avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
+ 
+ // Override get_buffer()/release_buffer() from codec context in order to 
retrieve the PTS of each frame.
+ m_context->opaque = this;
+-m_context->get_buffer = getBuffer;
+-m_context->release_buffer = releaseBuffer;
++m_context->get_buffer2 = getBuffer;
+ }
+ 
+ 
+@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur
+ #ifdef USE_SWSCALE
+ if (m_swscale_ctx==0)
+ {
+-m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) 
src_pix_fmt,
+-  src_width, src_height, (PixelFormat) 
dst_pix_fmt,
++m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) 
src_pix_fmt,
++  src_width, src_height, (AVPixelFormat) 
dst_pix_fmt,
+   /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, 
NULL, NULL);
+ }
+ 
+@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co
+ AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
+ 
+ // Assign appropriate parts of the buffer to image planes in m_frame_rgba
+-avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
++avpicture_fill((AVPicture *) (m_frame_rgba).get(), 
&(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
+ 
+ // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own 
routine
+ 
+-if (m_context->pix_fmt == PIX_FMT_YUVA420P)
++if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
+ yuva420pToRgba(dst, src, width(), 

[arch-commits] Commit in openscenegraph/trunk (PKGBUILD giflib.patch)

2016-02-05 Thread Sergej Pupykin
Date: Friday, February 5, 2016 @ 23:04:07
  Author: spupykin
Revision: 160435

upgpkg: openscenegraph 3.4.0-1

upd

Modified:
  openscenegraph/trunk/PKGBUILD
Deleted:
  openscenegraph/trunk/giflib.patch

--+
 PKGBUILD |   41 -
 giflib.patch |   12 
 2 files changed, 8 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-05 22:04:00 UTC (rev 160434)
+++ PKGBUILD2016-02-05 22:04:07 UTC (rev 160435)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.2.3
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
@@ -12,45 +12,20 @@
 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')
+makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg')
 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')
+source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip)
+md5sums=('a5e762c64373a46932e444f6f7332496')
 
-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"
+#  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 |//#include |' 
src/osgPlugins/curl/ReaderWriterCURL.cpp
+-DCMAKE_BUILD_TYPE=Release
   make
 }
 

Deleted: giflib.patch
===
--- giflib.patch2016-02-05 22:04:00 UTC (rev 160434)
+++ giflib.patch2016-02-05 22:04:07 UTC (rev 160435)
@@ -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.0 +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;
- }
- 


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-12-07 Thread Evangelos Foutras
Date: Monday, December 7, 2015 @ 10:50:46
  Author: foutrelis
Revision: 149787

Back out bump to 3.4.0; was never pushed and breaks simgear

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   37 +++--
 1 file changed, 31 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 09:11:08 UTC (rev 149786)
+++ PKGBUILD2015-12-07 09:50:46 UTC (rev 149787)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.4.0
+pkgver=3.2.2
 pkgrel=2
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
@@ -12,20 +12,45 @@
 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')
+makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg-compat' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 
'ffmpeg-compat')
 conflicts=('openthreads')
 provides=('openthreads')
-source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip)
-md5sums=('a5e762c64373a46932e444f6f7332496')
+#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=('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
+-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 |//#include |' 
src/osgPlugins/curl/ReaderWriterCURL.cpp
   make
 }
 


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD giflib.patch)

2015-12-07 Thread Evangelos Foutras
Date: Monday, December 7, 2015 @ 11:17:01
  Author: foutrelis
Revision: 149793

C++11 ABI rebuild (+ bump to 3.2.3)

Added:
  openscenegraph/trunk/giflib.patch
Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 giflib.patch |   12 
 2 files changed, 15 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 10:13:54 UTC (rev 149792)
+++ PKGBUILD2015-12-07 10:17:01 UTC (rev 149793)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -20,7 +20,7 @@
 
source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip

https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch
giflib.patch)
-md5sums=('caa21fe5a1250806ddd372d8b7352b5f'
+md5sums=('02ffdad7744c747d8fad0d7babb58427'
  '6e3c75677f87113f18912916352c6cbd'
  '8c06c8410e8840e83c242b8b401cdad7')
 

Added: giflib.patch
===
--- giflib.patch(rev 0)
+++ giflib.patch2015-12-07 10:17:01 UTC (rev 149793)
@@ -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.0 +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;
+ }
+ 


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras
Date: Sunday, December 6, 2015 @ 18:46:44
  Author: foutrelis
Revision: 149003

C++11 ABI rebuild

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 17:46:30 UTC (rev 149002)
+++ PKGBUILD2015-12-06 17:46:44 UTC (rev 149003)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD giflib.patch)

2015-09-18 Thread Sergej Pupykin
Date: Friday, September 18, 2015 @ 20:08:20
  Author: spupykin
Revision: 140659

Modified:
  openscenegraph/trunk/PKGBUILD
Deleted:
  openscenegraph/trunk/giflib.patch

--+
 PKGBUILD |   39 +++
 giflib.patch |   12 
 2 files changed, 7 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-18 10:51:46 UTC (rev 140658)
+++ PKGBUILD2015-09-18 18:08:20 UTC (rev 140659)
@@ -5,52 +5,27 @@
 # Contributor: Colin Pitrat 
 
 pkgname=openscenegraph
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.4.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' 'qt5-base' 'ffmpeg-compat' 'mesa')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 
'ffmpeg-compat')
+makedepends=('cmake' 'libvncserver' 'qt5-base' 'ffmpeg' 'mesa')
+optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt5-base' 'ffmpeg')
 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')
+source=(http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip)
+md5sums=('a5e762c64373a46932e444f6f7332496')
 
-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 |//#include |' 
src/osgPlugins/curl/ReaderWriterCURL.cpp
+-DCMAKE_BUILD_TYPE=Release
   make
 }
 

Deleted: giflib.patch
===
--- giflib.patch2015-09-18 10:51:46 UTC (rev 140658)
+++ giflib.patch2015-09-18 18:08:20 UTC (rev 140659)
@@ -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.0 +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;
- }
- 


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-09-02 Thread Sergej Pupykin
Date: Wednesday, September 2, 2015 @ 12:25:16
  Author: spupykin
Revision: 139103

upgpkg: openscenegraph 3.2.2-2

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-02 10:01:39 UTC (rev 139102)
+++ PKGBUILD2015-09-02 10:25:16 UTC (rev 139103)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-08-05 Thread Sergej Pupykin
Date: Wednesday, August 5, 2015 @ 12:22:47
  Author: spupykin
Revision: 137976

upgpkg: openscenegraph 3.2.2-1

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-05 10:03:50 UTC (rev 137975)
+++ PKGBUILD2015-08-05 10:22:47 UTC (rev 137976)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat colin.pit...@gmail.com
 
 pkgname=openscenegraph
-pkgver=3.2.1
-pkgrel=6
+pkgver=3.2.2
+pkgrel=1
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -20,14 +20,14 @@
 
source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip

https://github.com/openscenegraph/osg/commit/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch
giflib.patch)
-md5sums=('4f95206a1eef218bd007c3b43e1334f5'
+md5sums=('caa21fe5a1250806ddd372d8b7352b5f'
  '6e3c75677f87113f18912916352c6cbd'
  '8c06c8410e8840e83c242b8b401cdad7')
 
 prepare() {
   cd OpenSceneGraph-$pkgver
-  patch -p1 $srcdir/giflib.patch
-  patch -p1 $srcdir/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch
+#  patch -p1 $srcdir/giflib.patch
+#  patch -p1 $srcdir/49d560f4d9d0641c98df67264b7ace4733c6b9a9.patch
 }
 
 build() {


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-06-29 Thread Sergej Pupykin
Date: Monday, June 29, 2015 @ 14:45:08
  Author: spupykin
Revision: 136118

upgpkg: openscenegraph 3.2.1-6

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-29 12:44:58 UTC (rev 136117)
+++ PKGBUILD2015-06-29 12:45:08 UTC (rev 136118)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.1
-pkgrel=5
+pkgrel=6
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-05-10 Thread Sergej Pupykin
Date: Sunday, May 10, 2015 @ 22:07:21
  Author: spupykin
Revision: 133211

upgpkg: openscenegraph 3.2.1-5

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-10 20:07:15 UTC (rev 133210)
+++ PKGBUILD2015-05-10 20:07:21 UTC (rev 133211)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2015-02-26 Thread Sergej Pupykin
Date: Thursday, February 26, 2015 @ 17:29:32
  Author: spupykin
Revision: 128286

upgpkg: openscenegraph 3.2.1-4

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-26 16:11:13 UTC (rev 128285)
+++ PKGBUILD2015-02-26 16:29:32 UTC (rev 128286)
@@ -6,14 +6,14 @@
 
 pkgname=openscenegraph
 pkgver=3.2.1
-pkgrel=3
+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')
+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


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2014-11-25 Thread Sergej Pupykin
Date: Tuesday, November 25, 2014 @ 12:16:34
  Author: spupykin
Revision: 123103

upgpkg: openscenegraph 3.2.1-3

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 00:33:56 UTC (rev 123102)
+++ PKGBUILD2014-11-25 11:16:34 UTC (rev 123103)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -18,13 +18,16 @@
 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() {


[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2014-09-17 Thread Sergej Pupykin
Date: Wednesday, September 17, 2014 @ 21:32:44
  Author: spupykin
Revision: 119118

upgpkg: openscenegraph 3.2.1-2

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-17 19:28:43 UTC (rev 119117)
+++ PKGBUILD2014-09-17 19:32:44 UTC (rev 119118)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2014-07-07 Thread Sergej Pupykin
Date: Monday, July 7, 2014 @ 11:30:20
  Author: spupykin
Revision: 115270

upgpkg: openscenegraph 3.2.1-1

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-07 09:30:17 UTC (rev 115269)
+++ PKGBUILD2014-07-07 09:30:20 UTC (rev 115270)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat colin.pit...@gmail.com
 
 pkgname=openscenegraph
-pkgver=3.2.0
-pkgrel=4
+pkgver=3.2.1
+pkgrel=1
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -19,7 +19,7 @@
 
#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'
+md5sums=('4f95206a1eef218bd007c3b43e1334f5'
  '8c06c8410e8840e83c242b8b401cdad7')
 
 prepare() {



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD giflib.patch)

2014-05-29 Thread Sergej Pupykin
Date: Thursday, May 29, 2014 @ 17:29:16
  Author: spupykin
Revision: 112190

upgpkg: openscenegraph 3.2.0-4

upd

Added:
  openscenegraph/trunk/giflib.patch
Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 giflib.patch |   12 
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-29 15:08:27 UTC (rev 112189)
+++ PKGBUILD2014-05-29 15:29:16 UTC (rev 112190)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -17,9 +17,16 @@
 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')
+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

Added: giflib.patch
===
--- giflib.patch(rev 0)
+++ giflib.patch2014-05-29 15:29:16 UTC (rev 112190)
@@ -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.0 +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;
+ }
+ 



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-07-30 Thread Sergej Pupykin
Date: Tuesday, July 30, 2013 @ 13:30:15
  Author: spupykin
Revision: 94783

upgpkg: openscenegraph 3.2.0-3

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-30 11:26:46 UTC (rev 94782)
+++ PKGBUILD2013-07-30 11:30:15 UTC (rev 94783)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-07-25 Thread Sergej Pupykin
Date: Thursday, July 25, 2013 @ 12:41:09
  Author: spupykin
Revision: 94453

upgpkg: openscenegraph 3.2.0-1

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-25 10:11:18 UTC (rev 94452)
+++ PKGBUILD2013-07-25 10:41:09 UTC (rev 94453)
@@ -5,8 +5,8 @@
 # Contributor: Colin Pitrat colin.pit...@gmail.com
 
 pkgname=openscenegraph
-pkgver=3.0.1
-pkgrel=11
+pkgver=3.2.0
+pkgrel=1
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
@@ -16,11 +16,9 @@
 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')
+#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
@@ -42,8 +40,7 @@
 -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
+#  sed -i 's|#include curl/types.h|//#include curl/types.h|' 
src/osgPlugins/curl/ReaderWriterCURL.cpp
   make
 }
 



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-07-12 Thread Sergej Pupykin
Date: Friday, July 12, 2013 @ 13:55:17
  Author: spupykin
Revision: 93980

upgpkg: openscenegraph 3.0.1-11

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-12 11:33:43 UTC (rev 93979)
+++ PKGBUILD2013-07-12 11:55:17 UTC (rev 93980)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=10
+pkgrel=11
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-04-29 Thread Sergej Pupykin
Date: Monday, April 29, 2013 @ 17:31:10
  Author: spupykin
Revision: 89495

upgpkg: openscenegraph 3.0.1-10

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 15:30:29 UTC (rev 89494)
+++ PKGBUILD2013-04-29 15:31:10 UTC (rev 89495)
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=9
+pkgrel=10
 pkgdesc=An Open Source, high performance real-time graphics toolkit
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-02-19 Thread Sergej Pupykin
Date: Tuesday, February 19, 2013 @ 15:57:58
  Author: spupykin
Revision: 84523

upgpkg: openscenegraph 3.0.1-9

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-19 14:57:54 UTC (rev 84522)
+++ PKGBUILD2013-02-19 14:57:58 UTC (rev 84523)
@@ -6,14 +6,14 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=8
+pkgrel=9
 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' 'qt' 'ffmpeg-compat' 'mesa')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
+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



[arch-commits] Commit in openscenegraph/trunk (PKGBUILD)

2013-02-07 Thread Sergej Pupykin
Date: Thursday, February 7, 2013 @ 16:33:31
  Author: spupykin
Revision: 83958

upgpkg: openscenegraph 3.0.1-8

upd

Modified:
  openscenegraph/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-07 15:33:26 UTC (rev 83957)
+++ PKGBUILD2013-02-07 15:33:31 UTC (rev 83958)
@@ -6,13 +6,13 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=7
+pkgrel=8
 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' 'qt' 'ffmpeg-compat')
+makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat' 'mesa')
 optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
 conflicts=('openthreads')
 provides=('openthreads')