gstreamer-32: 1.16.2 -> 1.18.0

4 files changed, 33 insertions, 133 deletions

diff --git a/gstreamer-32/.footprint b/gstreamer-32/.footprint
index 2b70fa68..8b2f78da 100644
--- a/gstreamer-32/.footprint
+++ b/gstreamer-32/.footprint
@@ -1,33 +1,27 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/
--rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/gst-completion-helper
+-rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/gst-hotdoc-plugins-scanner
 -rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/gst-plugin-scanner
+-rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/gst-plugins-doc-cache-generator
 -rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/gst-ptp-helper
--rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/libgstcoreelements.la
 -rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/libgstcoreelements.so
--rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/libgstcoretracers.la
 -rwxr-xr-x	root/root	usr/lib32/gstreamer-1.0/libgstcoretracers.so
--rwxr-xr-x	root/root	usr/lib32/libgstbase-1.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgstbase-1.0.so -> libgstbase-1.0.so.0.1602.0
-lrwxrwxrwx	root/root	usr/lib32/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstbase-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstcheck-1.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgstcheck-1.0.so -> libgstcheck-1.0.so.0.1602.0
-lrwxrwxrwx	root/root	usr/lib32/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstcheck-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstcontroller-1.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0.1602.0
-lrwxrwxrwx	root/root	usr/lib32/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstcontroller-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstnet-1.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgstnet-1.0.so -> libgstnet-1.0.so.0.1602.0
-lrwxrwxrwx	root/root	usr/lib32/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstnet-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstreamer-1.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgstreamer-1.0.so -> libgstreamer-1.0.so.0.1602.0
-lrwxrwxrwx	root/root	usr/lib32/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.1602.0
--rwxr-xr-x	root/root	usr/lib32/libgstreamer-1.0.so.0.1602.0
+lrwxrwxrwx	root/root	usr/lib32/libgstbase-1.0.so -> libgstbase-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib32/libgstbase-1.0.so.0 -> libgstbase-1.0.so.0.1800.0
+-rwxr-xr-x	root/root	usr/lib32/libgstbase-1.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib32/libgstcheck-1.0.so -> libgstcheck-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib32/libgstcheck-1.0.so.0 -> libgstcheck-1.0.so.0.1800.0
+-rwxr-xr-x	root/root	usr/lib32/libgstcheck-1.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib32/libgstcontroller-1.0.so -> libgstcontroller-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib32/libgstcontroller-1.0.so.0 -> libgstcontroller-1.0.so.0.1800.0
+-rwxr-xr-x	root/root	usr/lib32/libgstcontroller-1.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib32/libgstnet-1.0.so -> libgstnet-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib32/libgstnet-1.0.so.0 -> libgstnet-1.0.so.0.1800.0
+-rwxr-xr-x	root/root	usr/lib32/libgstnet-1.0.so.0.1800.0
+lrwxrwxrwx	root/root	usr/lib32/libgstreamer-1.0.so -> libgstreamer-1.0.so.0
+lrwxrwxrwx	root/root	usr/lib32/libgstreamer-1.0.so.0 -> libgstreamer-1.0.so.0.1800.0
+-rwxr-xr-x	root/root	usr/lib32/libgstreamer-1.0.so.0.1800.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gstreamer-1.0.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gstreamer-base-1.0.pc
diff --git a/gstreamer-32/.signature b/gstreamer-32/.signature
index 1097a088..dda1383b 100644
--- a/gstreamer-32/.signature
+++ b/gstreamer-32/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXUz0DCl9EbbPLjMckN8d5mQi0l0JFiMWZ6F0MPFLAa/fDSPPF9aDisxo7tK47a2sAgzlVP6AIueXqvcb3NCnfwQ=
-SHA256 (Pkgfile) = 338bd0758dd91236bb09da2bffe4abc96d3ad97dfcf632ac40ea0cd399eab814
-SHA256 (.footprint) = e3b7a334b31b1479504f033a4d37d50c5fd781a6222d938fa5485d22736b6e77
-SHA256 (gstreamer-1.16.2.tar.xz) = e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
-SHA256 (gstreamer-1.14.5-make43.patch) = dc0fe4e1335f5ff4d3aa007301a6419ddbb92b15cb5e130ce48cdb83ab03d12b
+RWSwxGo/zH7eXc+IHuywsgWmtdLLzGB80WUQOwaFQLI228sdAIgoRHkU+Rdby5vQhhmzOGNT0jHru3xF3wuhhw5CrS1NO1q2IwE=
+SHA256 (Pkgfile) = 88c3a580c4c3d4d648595e6f13f1b759333e76decfa9735e9fbb79b8d5f50a0a
+SHA256 (.footprint) = 6121f13c5e5811b07e6de524169437bb0dccd7cd9c85115b333c73359cddf18e
+SHA256 (gstreamer-1.18.0.tar.xz) = 0ff09245b06c0aeb5d9a156edcab088a7e8213a0bf9c84a1ff0318f9c00c7805
diff --git a/gstreamer-32/Pkgfile b/gstreamer-32/Pkgfile
index cc37efc7..5ce646c8 100644
--- a/gstreamer-32/Pkgfile
+++ b/gstreamer-32/Pkgfile
@@ -4,35 +4,26 @@
 # Depends on: glib-32 gstreamer libcap-32
 
 name=gstreamer-32
-version=1.16.2
+version=1.18.0
 release=1
-source=(https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$version.tar.xz
-	gstreamer-1.14.5-make43.patch)
+source=(https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$version.tar.xz)
 
 build() {
 	cd gstreamer-$version
 
-	patch -p1 -i $SRC/gstreamer-1.14.5-make43.patch
-
-	./configure \
+	meson build \
 		--prefix=/usr \
 		--libdir=/usr/lib32 \
 		--libexecdir=/usr/lib32 \
-		--build=i686-pc-linux-gnu \
-		--disable-debug \
-		--disable-nls \
-		--disable-dependency-tracking \
-		--disable-valgrind \
-		--disable-examples \
-		--disable-gtk-doc-html \
-		--disable-gtk-doc-pdf \
-		--disable-gtk-doc
+		-D buildtype=release \
+		-D gtk_doc=disabled \
+		-D nls=disabled \
+		-D introspection=disabled \
+		-D package-name="GStreamer (CRUX Linux)" \
+		-D package-origin="https://crux.nu/"
 
-	# fight unused direct deps
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  
-	make
-	make DESTDIR=$PKG install
+        ninja -C build -j ${JOBS:-1}
+        DESTDIR=$PKG ninja -C build install
 
-	rm -r $PKG/usr/{bin,include,share/man,share/gtk-doc,share}
+	rm -r $PKG/usr/{bin,include,share/man,share}
 }
diff --git a/gstreamer-32/gstreamer-1.14.5-make43.patch b/gstreamer-32/gstreamer-1.14.5-make43.patch
deleted file mode 100644
index e22cc9f8..00000000
--- a/gstreamer-32/gstreamer-1.14.5-make43.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/common/glib-gen.mak
-+++ b/common/glib-gen.mak
-@@ -1,11 +1,13 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_enum_prefix=gst_color_balance
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- %-marshal.h: %-marshal.list
---- a/common/gst-glib-gen.mak
-+++ b/common/gst-glib-gen.mak
-@@ -1,14 +1,16 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
-+H := \#
-+
- #glib_enum_headers=$(colorbalance_headers)
- #glib_enum_define=GST_COLOR_BALANCE
- #glib_gen_prefix=gst_color_balance
- #glib_gen_basename=colorbalance
- #glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
---- a/libs/gst/controller/Makefile.in
-+++ b/libs/gst/controller/Makefile.in
-@@ -17,13 +17,6 @@
- # these are the variables your Makefile.am should set
- # the example is based on the colorbalance interface
- 
--#glib_enum_headers=$(colorbalance_headers)
--#glib_enum_define=GST_COLOR_BALANCE
--#glib_gen_prefix=gst_color_balance
--#glib_gen_basename=colorbalance
--#glib_gen_decl_banner=GST_EXPORT
--#glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
--
- 
- 
- VPATH = @srcdir@
-@@ -550,11 +543,12 @@
- 	gstinterpolationcontrolsource.h \
- 	gstlfocontrolsource.h
- 
-+H := \#
- glib_enum_define = GST_CONTROLLER
- glib_gen_prefix = gst
- glib_gen_basename = controller
- glib_gen_decl_banner = GST_CONTROLLER_API
--glib_gen_decl_include = \#include <gst/controller/controller-prelude.h>
-+glib_gen_decl_include = $(H)include <gst/controller/controller-prelude.h>
- built_sources = controller-enumtypes.c
- built_headers = controller-enumtypes.h
- BUILT_SOURCES = $(built_sources) $(built_headers)
-@@ -587,7 +581,14 @@
- libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
- libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
- CLEANFILES = *.gcno *.gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
--enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+
-+#glib_enum_headers=$(colorbalance_headers)
-+#glib_enum_define=GST_COLOR_BALANCE
-+#glib_gen_prefix=gst_color_balance
-+#glib_gen_basename=colorbalance
-+#glib_gen_decl_banner=GST_EXPORT
-+#glib_gen_decl_include=$(H)include <gst/foo/foo-prelude.h>
-+enum_headers = $(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\")
- @HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
- @HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
- @HAVE_INTROSPECTION_TRUE@	$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \