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

[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
===================================================================
--- PKGBUILD	2016-02-05 22:04:00 UTC (rev 160434)
+++ PKGBUILD	2016-02-05 22:04:07 UTC (rev 160435)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat <colin.pitrat at gmail.com>
 
 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 <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
+    -DCMAKE_BUILD_TYPE=Release
   make
 }
 

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