pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gstreamer1: update to 1.18.5

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Nov 8 14:18:06 2021 +0100
Changeset:	f1ae580dec9874245575b13e34aea9add56cea45

Modified Files:
	gstreamer1/Makefile
	gstreamer1/PLIST
	gstreamer1/buildlink3.mk
	gstreamer1/distinfo
	gstreamer1/options.mk

Log Message:
gstreamer1: update to 1.18.5

Add some more dependencies, remove some options.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f1ae580dec9874245575b13e34aea9add56cea45

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gstreamer1/Makefile      |  9 ++++-----
 gstreamer1/PLIST         | 40 ++++++++++++++++++++--------------------
 gstreamer1/buildlink3.mk |  3 ---
 gstreamer1/distinfo      |  6 +++---
 gstreamer1/options.mk    | 27 +++++----------------------
 5 files changed, 32 insertions(+), 53 deletions(-)

diffs:
diff --git a/gstreamer1/Makefile b/gstreamer1/Makefile
index b8d6ab1d29..d5a6d9fa77 100644
--- a/gstreamer1/Makefile
+++ b/gstreamer1/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.49 2020/08/31 18:10:28 wiz Exp $
 
-DISTNAME=	gstreamer-1.18.4
+DISTNAME=	gstreamer-1.18.5
 PKGNAME=	${DISTNAME:S/gstreamer/gstreamer1/}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer/
@@ -35,11 +35,10 @@ REPLACE_PYTHON+=	output/gst/parse/gen_lex.py
 REPLACE_PYTHON+=	output/gst/parse/gen_grammar.py
 REPLACE_PYTHON+=	output/docs/gst-plugins-doc-cache-generator
 
-#Library gmp found: NO
-#Library gsl found: NO
-#Library gslcblas found: NO
-
 .include "../../lang/python/application.mk"
 .include "../../devel/meson/build.mk"
+.include "../../devel/check/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gstreamer1/PLIST b/gstreamer1/PLIST
index 951ab44d1e..f0e5574566 100644
--- a/gstreamer1/PLIST
+++ b/gstreamer1/PLIST
@@ -22,14 +22,14 @@ include/gstreamer-1.0/gst/base/gstflowcombiner.h
 include/gstreamer-1.0/gst/base/gstpushsrc.h
 include/gstreamer-1.0/gst/base/gstqueuearray.h
 include/gstreamer-1.0/gst/base/gsttypefindhelper.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/check-prelude.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/check.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/gstbufferstraw.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/gstcheck.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/gstconsistencychecker.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/gstharness.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/gsttestclock.h
-${PLIST.gstcheck}include/gstreamer-1.0/gst/check/internal-check.h
+include/gstreamer-1.0/gst/check/check-prelude.h
+include/gstreamer-1.0/gst/check/check.h
+include/gstreamer-1.0/gst/check/gstbufferstraw.h
+include/gstreamer-1.0/gst/check/gstcheck.h
+include/gstreamer-1.0/gst/check/gstconsistencychecker.h
+include/gstreamer-1.0/gst/check/gstharness.h
+include/gstreamer-1.0/gst/check/gsttestclock.h
+include/gstreamer-1.0/gst/check/internal-check.h
 include/gstreamer-1.0/gst/controller/controller-enumtypes.h
 include/gstreamer-1.0/gst/controller/controller-prelude.h
 include/gstreamer-1.0/gst/controller/controller.h
@@ -128,29 +128,29 @@ include/gstreamer-1.0/gst/net/net-prelude.h
 include/gstreamer-1.0/gst/net/net.h
 ${PLIST.introspection}lib/girepository-1.0/Gst-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstBase-1.0.typelib
-${PLIST.gstcheck}${PLIST.introspection}lib/girepository-1.0/GstCheck-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstCheck-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstController-1.0.typelib
 ${PLIST.introspection}lib/girepository-1.0/GstNet-1.0.typelib
 lib/gstreamer-1.0/libgstcoreelements.so
 lib/gstreamer-1.0/libgstcoretracers.so
 lib/libgstbase-1.0.so
 lib/libgstbase-1.0.so.0
-lib/libgstbase-1.0.so.0.1804.0
-${PLIST.gstcheck}lib/libgstcheck-1.0.so
-${PLIST.gstcheck}lib/libgstcheck-1.0.so.0
-${PLIST.gstcheck}lib/libgstcheck-1.0.so.0.1804.0
+lib/libgstbase-1.0.so.0.1805.0
+lib/libgstcheck-1.0.so
+lib/libgstcheck-1.0.so.0
+lib/libgstcheck-1.0.so.0.1805.0
 lib/libgstcontroller-1.0.so
 lib/libgstcontroller-1.0.so.0
-lib/libgstcontroller-1.0.so.0.1804.0
+lib/libgstcontroller-1.0.so.0.1805.0
 lib/libgstnet-1.0.so
 lib/libgstnet-1.0.so.0
-lib/libgstnet-1.0.so.0.1804.0
+lib/libgstnet-1.0.so.0.1805.0
 lib/libgstreamer-1.0.so
 lib/libgstreamer-1.0.so.0
-lib/libgstreamer-1.0.so.0.1804.0
+lib/libgstreamer-1.0.so.0.1805.0
 lib/pkgconfig/gstreamer-1.0.pc
 lib/pkgconfig/gstreamer-base-1.0.pc
-${PLIST.gstcheck}lib/pkgconfig/gstreamer-check-1.0.pc
+lib/pkgconfig/gstreamer-check-1.0.pc
 lib/pkgconfig/gstreamer-controller-1.0.pc
 lib/pkgconfig/gstreamer-net-1.0.pc
 libexec/gstreamer-1.0/gst-hotdoc-plugins-scanner
@@ -161,13 +161,13 @@ man/man1/gst-inspect-1.0.1
 man/man1/gst-launch-1.0.1
 man/man1/gst-stats-1.0.1
 man/man1/gst-typefind-1.0.1
-${PLIST.gstcheck}share/aclocal/gst-element-check-1.0.m4
-share/gdb/auto-load/usr/pkg/lib/libgstreamer-1.0.so.0.1804.0-gdb.py
 ${PLIST.introspection}share/gir-1.0/Gst-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstBase-1.0.gir
-${PLIST.gstcheck}${PLIST.introspection}share/gir-1.0/GstCheck-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstCheck-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstController-1.0.gir
 ${PLIST.introspection}share/gir-1.0/GstNet-1.0.gir
+share/aclocal/gst-element-check-1.0.m4
+share/gdb/auto-load/usr/pkg/lib/libgstreamer-1.0.so.0.1805.0-gdb.py
 share/gstreamer-1.0/gdb/glib_gobject_helper.py
 share/gstreamer-1.0/gdb/gst_gdb.py
 share/locale/af/LC_MESSAGES/gstreamer-1.0.mo
diff --git a/gstreamer1/buildlink3.mk b/gstreamer1/buildlink3.mk
index bb87c99679..b1022ddc63 100644
--- a/gstreamer1/buildlink3.mk
+++ b/gstreamer1/buildlink3.mk
@@ -11,10 +11,7 @@ BUILDLINK_PKGSRCDIR.gstreamer1?=	../../wip/gstreamer1
 pkgbase := gstreamer1
 .include "../../mk/pkg-build-options.mk"
 
-.if ${PKG_BUILD_OPTIONS.gstreamer1:Mgstcheck}
 .include "../../devel/check/buildlink3.mk"
-.endif
-
 .include "../../devel/glib2/buildlink3.mk"
 .endif # GSTREAMER1_BUILDLINK3_MK
 
diff --git a/gstreamer1/distinfo b/gstreamer1/distinfo
index 8463ee3714..6563a9de5c 100644
--- a/gstreamer1/distinfo
+++ b/gstreamer1/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.40 2020/07/16 11:27:25 markd Exp $
 
-RMD160 (gstreamer-1.18.4.tar.xz) = ec0c7f2163651ba43b246de1ec8bcccea1af6aa1
-SHA512 (gstreamer-1.18.4.tar.xz) = 5312c621fc354b35cc81f53b4ec65c661ad2c22acef2640bc27860234243d06e00e3aaf41c93d379d8424c0ecdf2ae06096dec0d0313215426348ffa0afb3c4a
-Size (gstreamer-1.18.4.tar.xz) = 2703948 bytes
+BLAKE2s (gstreamer-1.18.5.tar.xz) = 996c470c36c5adf06c9e5e5cf13d394f621f2446b94c3bd54b400ab0221fa562
+SHA512 (gstreamer-1.18.5.tar.xz) = b0bec94e8fe419610fda750618684c25ad8cbbc50e05b6767eb6a5ca81f0f1dc43a1e8a35d255334c9fe63308a67e94763686cf585b9cf09ebbf754ead074293
+Size (gstreamer-1.18.5.tar.xz) = 2710712 bytes
 SHA1 (patch-plugins_tracers_gstrusage.c) = 36ab41bc208cd9146bed3208f56eb332f2535591
diff --git a/gstreamer1/options.mk b/gstreamer1/options.mk
index 6554e69217..a57f8715c5 100644
--- a/gstreamer1/options.mk
+++ b/gstreamer1/options.mk
@@ -1,33 +1,16 @@
 # $NetBSD: options.mk,v 1.9 2019/10/03 20:45:19 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gstreamer
-PKG_SUPPORTED_OPTIONS=	gstreamer-gstcheck introspection gstreamer-ptp-suid
-PKG_SUGGESTED_OPTIONS=	gstreamer-gstcheck introspection
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gstreamer1
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS=	introspection
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	gstcheck introspection
-
-.if !empty(PKG_OPTIONS:Mgstreamer-gstcheck)
-.include "../../devel/check/buildlink3.mk"
-PLIST.gstcheck=		yes
-# don't worry if the "GstABI" check fails -- GstPlugin contains
-# off_t and time_t which are system dependent
-TEST_TARGET=		check-torture
-.else
-CONFIGURE_ARGS+=	--disable-check
-.endif
+PLIST_VARS+=	introspection
 
 .if !empty(PKG_OPTIONS:Mintrospection)
 .include "../../devel/gobject-introspection/buildlink3.mk"
 PLIST.introspection=	yes
 .else
-CONFIGURE_ARGS+=	--disable-introspection
-.endif
-
-.if !empty(PKG_OPTIONS:Mgstreamer-ptp-suid)
-SPECIAL_PERMS+=		libexec/gstreamer-1.0/gst-ptp-helper ${SETUID_ROOT_PERMS}
-CONFIGURE_ARGS+=	--with-ptp-helper-permissions=setuid-root
-.else
-CONFIGURE_ARGS+=	--with-ptp-helper-permissions=none
+MESON_ARGS+=		-D introspection=disabled
 .endif
Home | Main Index | Thread Index | Old Index