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

Evangelos Foutras foutrelis at archlinux.org
Mon Dec 7 09:50:46 UTC 2015


    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
===================================================================
--- PKGBUILD	2015-12-07 09:11:08 UTC (rev 149786)
+++ PKGBUILD	2015-12-07 09:50:46 UTC (rev 149787)
@@ -5,7 +5,7 @@
 # Contributor: Colin Pitrat <colin.pitrat at gmail.com>
 
 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 <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
   make
 }
 



More information about the arch-commits mailing list