revision

2 files changed, 39 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2816b38ccee..1867c9b93e68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = openscenegraph-git
 	pkgdesc = An open source, high performance real-time graphics toolkit
-	pkgver = 3.6.5.r103.g06558a5dd
+	pkgver = 3.6.5.r108.g925270d90
 	pkgrel = 2
-	url = http://www.openscenegraph.org
+	url = https://www.openscenegraph.com/
 	arch = x86_64
 	license = custom:OSGPL
 	makedepends = git
 	makedepends = cmake
 	makedepends = fontconfig
-	makedepends = ffmpeg4.4
 	makedepends = gdal
 	makedepends = gst-plugins-base-libs
 	makedepends = jasper
@@ -16,9 +15,11 @@ pkgbase = openscenegraph-git
 	makedepends = libvncserver
 	makedepends = openexr
 	makedepends = poppler-glib
+	depends = glibc
+	depends = gcc-libs
+	depends = ffmpeg4.4
 	depends = libglvnd
 	depends = libxinerama
-	optdepends = ffmpeg4.4
 	optdepends = gdal
 	optdepends = gst-plugins-base-libs
 	optdepends = jasper
@@ -31,6 +32,10 @@ pkgbase = openscenegraph-git
 	conflicts = openscenegraph
 	conflicts = openthreads
 	source = git+https://github.com/openscenegraph/OpenSceneGraph.git#branch=OpenSceneGraph-3.6
+	source = openscenegraph-ffmpeg4.4.patch::https://gitlab.archlinux.org/archlinux/packaging/packages/openscenegraph/-/raw/main/ffmpeg4.4.patch
+	source = https://gitlab.archlinux.org/archlinux/packaging/packages/openscenegraph/-/raw/main/openscenegraph-openexr3.patch
 	sha256sums = SKIP
+	sha256sums = 64a492d266e49aec611fd609251fa7dd08f75e86b25120a1abaf0328223c921a
+	sha256sums = 680ea7cd1b1681fb42137dd1510c64862507b889286d8788d3f017d9d307792d
 
 pkgname = openscenegraph-git
diff --git a/PKGBUILD b/PKGBUILD
index e4571725bca3..8372066c35d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,44 +3,55 @@
 # Contributor: jmf <jmf at mesecons dot net>
 
 pkgname=openscenegraph-git
-pkgver=3.6.5.r103.g06558a5dd
+pkgver=3.6.5.r108.g925270d90
 pkgrel=2
 pkgdesc="An open source, high performance real-time graphics toolkit"
 arch=(x86_64)
-url="http://www.openscenegraph.org"
+url="https://www.openscenegraph.com/"
 license=('custom:OSGPL')
-depends=(libglvnd libxinerama)
-makedepends=(git cmake fontconfig ffmpeg4.4 gdal gst-plugins-base-libs jasper librsvg libvncserver openexr poppler-glib)
-optdepends=(ffmpeg4.4 gdal gst-plugins-base-libs jasper librsvg libvncserver openexr poppler-glib)
+depends=(glibc gcc-libs ffmpeg4.4 libglvnd libxinerama)
+makedepends=(git cmake fontconfig gdal gst-plugins-base-libs jasper librsvg libvncserver openexr poppler-glib)
+
+# fail to build with: opencascade
+# not detected: poppler
+# not detected: COLLADA (opencollada)
+# not detected: LIBLAS
+# not detected: ZeroConf (avahi ?)
+# not detected: LIBLAS (blas libblas.so) (openblas libopenblas.so) also 64 bit integer variant
+# automagick deps: gtk2 gtkglext dcmtk coin (INVENTOR) sdl12-compat
+
+optdepends=(gdal gst-plugins-base-libs jasper librsvg libvncserver openexr poppler-glib)
 provides=(openscenegraph openthreads)
 conflicts=(openscenegraph openthreads)
-source=("git+https://github.com/openscenegraph/OpenSceneGraph.git#branch=OpenSceneGraph-3.6")
-sha256sums=('SKIP')
+source=("git+https://github.com/openscenegraph/OpenSceneGraph.git#branch=OpenSceneGraph-3.6"
+        "openscenegraph-ffmpeg4.4.patch::https://gitlab.archlinux.org/archlinux/packaging/packages/openscenegraph/-/raw/main/ffmpeg4.4.patch"
+        "https://gitlab.archlinux.org/archlinux/packaging/packages/openscenegraph/-/raw/main/openscenegraph-openexr3.patch")
+sha256sums=('SKIP'
+            '64a492d266e49aec611fd609251fa7dd08f75e86b25120a1abaf0328223c921a'
+            '680ea7cd1b1681fb42137dd1510c64862507b889286d8788d3f017d9d307792d')
 
 pkgver() {
   cd "${srcdir}/OpenSceneGraph"
   git describe --long --tags | sed 's/^OpenSceneGraph.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
-
 prepare() {
-  mkdir -p "${srcdir}/OpenSceneGraph/build"
+  cd OpenSceneGraph
+  patch -p1 < ../openscenegraph-openexr3.patch # Fix build with openEXR 3
+  patch -p1 < ../openscenegraph-ffmpeg4.4.patch # Find ffmpeg 4.4 headers
 }
 
 build() {
-  cd "${srcdir}/OpenSceneGraph/build"
-  cmake .. \
+  export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
+  cmake -B build -S "OpenSceneGraph" -Wno-dev \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_LIBDIR=lib
 
-  VERBOSE=1 make
+  cmake --build build
 }
 
 package(){
-  cd "${srcdir}/OpenSceneGraph/build"
-  make DESTDIR="$pkgdir" install
-  install -Dm 644 "../LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm 644 "OpenSceneGraph/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-