gst-plugins-base: include sub-projects gl-headers and graphine

3 files changed, 51 insertions, 9 deletions

diff --git a/gst-plugins-base/.footprint b/gst-plugins-base/.footprint
index 6fd685ffc..8da69d621 100644
--- a/gst-plugins-base/.footprint
+++ b/gst-plugins-base/.footprint
@@ -4,6 +4,34 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/gst-discoverer-1.0
 -rwxr-xr-x	root/root	usr/bin/gst-play-1.0
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/GL/
+-rw-r--r--	root/root	usr/include/GL/wglext.h
+drwxr-xr-x	root/root	usr/include/graphene-1.0/
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-box.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-euler.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-frustum.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-gobject.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-macros.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-matrix.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-plane.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-point.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-point3d.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-quad.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-quaternion.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-ray.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-rect.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-simd4f.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-simd4x4f.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-size.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-sphere.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-triangle.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-types.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-vec2.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-vec3.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-vec4.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-version-macros.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene-version.h
+-rw-r--r--	root/root	usr/include/graphene-1.0/graphene.h
 drwxr-xr-x	root/root	usr/include/gstreamer-1.0/
 drwxr-xr-x	root/root	usr/include/gstreamer-1.0/gst/
 drwxr-xr-x	root/root	usr/include/gstreamer-1.0/gst/allocators/
@@ -222,6 +250,9 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GstSdp-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GstTag-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/GstVideo-1.0.typelib
+drwxr-xr-x	root/root	usr/lib/graphene-1.0/
+drwxr-xr-x	root/root	usr/lib/graphene-1.0/include/
+-rw-r--r--	root/root	usr/lib/graphene-1.0/include/graphene-config.h
 drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/
 drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/include/
 drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/include/gst/
@@ -235,6 +266,7 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/include/gst/gl/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudiorate.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudioresample.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstaudiotestsrc.so
+-rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcdparanoia.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstcompositor.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstencoding.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstgio.so
@@ -259,6 +291,9 @@ drwxr-xr-x	root/root	usr/lib/gstreamer-1.0/include/gst/gl/
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstvorbis.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstximagesink.so
 -rwxr-xr-x	root/root	usr/lib/gstreamer-1.0/libgstxvimagesink.so
+lrwxrwxrwx	root/root	usr/lib/libgraphene-1.0.so -> libgraphene-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib/libgraphene-1.0.so.0 -> libgraphene-1.0.so.0.1000.2
+-rwxr-xr-x	root/root	usr/lib/libgraphene-1.0.so.0.1000.2
 lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so -> libgstallocators-1.0.so.0
 lrwxrwxrwx	root/root	usr/lib/libgstallocators-1.0.so.0 -> libgstallocators-1.0.so.0.1801.0
 -rwxr-xr-x	root/root	usr/lib/libgstallocators-1.0.so.0.1801.0
@@ -296,6 +331,8 @@ lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so -> libgstvideo-1.0.so.0
 lrwxrwxrwx	root/root	usr/lib/libgstvideo-1.0.so.0 -> libgstvideo-1.0.so.0.1801.0
 -rwxr-xr-x	root/root	usr/lib/libgstvideo-1.0.so.0.1801.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/graphene-1.0.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/graphene-gobject-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-allocators-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-app-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gstreamer-audio-1.0.pc
diff --git a/gst-plugins-base/.signature b/gst-plugins-base/.signature
index c890aa65f..426e2f1f8 100644
--- a/gst-plugins-base/.signature
+++ b/gst-plugins-base/.signature
@@ -1,5 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eHkKFWYT7ofDKS9CWMZJdTOgMfgcEUnUn0wIeGYTJPFp/SQ+hBta536tBVBaGT+Bhn4ij7Ts4daoAFcV5aA5g8=
-SHA256 (Pkgfile) = 164c5ed96af20c38a265f656f4e06436e6790f8472d4d3a2031c23d748ce6f54
-SHA256 (.footprint) = cbf2cd707daab3ceeae50cbecd55c5308ae1c43b987c8345308b3766dc2f1c07
+RWSE3ohX2g5d/evbehWW4NyYm+h/CPKVKVqoVbW6LbjqQUMNViEIoXCO97KF3mvikso1GaoxZ0ZwgbMoEgzNoR+H/PKh4tsJmQg=
+SHA256 (Pkgfile) = 2027dee89db7028bd759d8fe71f1a59f372a0bd65dad39ddc1de8a499d194080
+SHA256 (.footprint) = 06c33e550a1c5d7eb6ad6b7c03384ce35cdb6f2ba00549e27ede6617567eedc1
 SHA256 (gst-plugins-base-1.18.1.tar.xz) = 1ba654d7de30f7284b4c7071b32f881b609733ce02ab6d9d9ea29386a036c641
+SHA256 (gl-headers-5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8.tar.bz2) = 46b771874c9e14c2a94575eaf579877f34060950f7090e50b2b91f22399700a3
+SHA256 (graphene-1.10.2.tar.xz) = e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6
diff --git a/gst-plugins-base/Pkgfile b/gst-plugins-base/Pkgfile
index 00541a968..dd52d049d 100644
--- a/gst-plugins-base/Pkgfile
+++ b/gst-plugins-base/Pkgfile
@@ -6,13 +6,16 @@
 
 name=gst-plugins-base
 version=1.18.1
-release=1
-source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
+release=2
+source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz
+	https://gitlab.freedesktop.org/gstreamer/meson-ports/gl-headers/-/archive/5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8/gl-headers-5c8c7c0d3ca1f0b783272dac0b95e09414e49bc8.tar.bz2
+	https://github.com/ebassi/graphene/releases/download/1.10.2/graphene-1.10.2.tar.xz)
 
 build() {
-	cd $name-$version
+	mv gl-headers-* $name-$version/subprojects/gl-headers
+	mv graphene-* $name-$version/subprojects/graphene
 
-	meson build \
+	meson setup $name-$version build \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
 		-D buildtype=release \
@@ -21,6 +24,6 @@ build() {
 		-D package-name="GStreamer (CRUX Linux)" \
 		-D package-origin="https://crux.nu/"
 
-	ninja -C build -j ${JOBS:-1}
-	DESTDIR=$PKG ninja -C build install
+	meson compile -C build -j ${JOBS:-1}
+	DESTDIR=$PKG meson install -C build
 }