From de0854b87ce14cbe70e96d194a8a780d2c3d1ba9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 20 Sep 2020 21:40:42 +1000
Subject: [PATCH] gst_plugins_good: bump version

---
 ....recipe => gst_plugins_good-1.18.0.recipe} | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)
 rename media-libs/gst_plugins_good/{gst_plugins_good-1.16.2.recipe => gst_plugins_good-1.18.0.recipe} (84%)

diff --git a/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe b/media-libs/gst_plugins_good/gst_plugins_good-1.18.0.recipe
similarity index 84%
rename from media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe
rename to media-libs/gst_plugins_good/gst_plugins_good-1.18.0.recipe
index 1746a40a4..cdfde30db 100644
--- a/media-libs/gst_plugins_good/gst_plugins_good-1.16.2.recipe
+++ b/media-libs/gst_plugins_good/gst_plugins_good-1.18.0.recipe
@@ -5,11 +5,11 @@ for the supporting library)."
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 COPYRIGHT="Erik Walthinsen"
 LICENSE="GNU LGPL v2"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$portVersion.tar.xz"
-CHECKSUM_SHA256="40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319"
+CHECKSUM_SHA256="6329bc377a3afea5cf1ab329a91cc4a906f075781780d1edc59e8bea8c1a8bac"
 SOURCE_DIR="gst-plugins-good-$portVersion"
-sinkVersion=$portVersion
+sinkVersion="1.16.2"
 SOURCE_URI_2="https://github.com/threedeyes/gsthaikuaudiosink/archive/$sinkVersion.tar.gz"
 CHECKSUM_SHA256_2="f60eecc132262bd9d2f6fb9440c448ff0d6c484634f20e8464b7a45dbbde7bfa"
 SOURCE_FILENAME_2="gsthaikuaudiosink-$sinkVersion.tar.gz"
@@ -18,7 +18,7 @@ SOURCE_DIR_2="gsthaikuaudiosink-$sinkVersion"
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="0.1602.0"
+libVersion="0.1800.0"
 
 PROVIDES="
 	gst_plugins_good$secondaryArchSuffix = $portVersion
@@ -84,16 +84,15 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
 	cmd:bison
 	cmd:cmake
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
+	cmd:meson
+	cmd:ninja
 	cmd:orcc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:python
@@ -103,14 +102,25 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	runConfigure ./configure \
-		--disable-debug \
-		--disable-examples \
-		--disable-nls \
-		--disable-oss \
-		--disable-oss4 \
-		--enable-orc
-	make $jobArgs
+	export CFLAGS="-lnetwork"
+
+	meson build \
+		--prefix=$prefix \
+		--bindir=$binDir \
+		--libdir=$libDir \
+		--libexecdir=$libDir \
+		--datadir=$dataDir \
+		--mandir=$manDir \
+		--includedir=$includeDir \
+		-D doc=disabled \
+		-D package-name="GStreamer Plugins Good (Haiku)" \
+		-D package-origin="https://www.haiku-os.org/" \
+		-D examples=disabled \
+		-D test=disabled \
+		-D nls=disabled \
+		-D orc=enabled
+
+	meson compile -C build
 
 	cd $sourceDir2
 	cmake .
@@ -119,9 +129,7 @@ BUILD()
 
 INSTALL()
 {
-	make install
-
-	rm $libDir/gstreamer-1.0/*.la
+	meson install -C build
 
 	cd $sourceDir2
 	cp -f libgsthaikuaudiosink.so $libDir/gstreamer-1.0