pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gstreamer1 + plugins: more cleanups
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Mon Nov 8 20:16:29 2021 +0100
Changeset: a917642be3c3ec2c5dd7f88cc7dc2abae467be71
Modified Files:
gst-plugins1-bad/options.mk
gst-plugins1-base/DESCR
gst-plugins1-base/Makefile
gst-plugins1-base/PLIST
gst-plugins1-base/buildlink3.mk
gst-plugins1-good/Makefile
gstreamer1/Makefile
gstreamer1/PLIST
Added Files:
gst-plugins1-base/options.mk
Log Message:
gstreamer1 + plugins: more cleanups
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a917642be3c3ec2c5dd7f88cc7dc2abae467be71
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gst-plugins1-bad/options.mk | 2 +-
gst-plugins1-base/DESCR | 18 ++++++----------
gst-plugins1-base/Makefile | 23 ++++++++++----------
gst-plugins1-base/PLIST | 48 ++++++++++++++++++++---------------------
gst-plugins1-base/buildlink3.mk | 1 -
gst-plugins1-base/options.mk | 16 ++++++++++++++
gst-plugins1-good/Makefile | 12 +++++------
gstreamer1/Makefile | 2 ++
gstreamer1/PLIST | 4 ++--
9 files changed, 68 insertions(+), 58 deletions(-)
diffs:
diff --git a/gst-plugins1-bad/options.mk b/gst-plugins1-bad/options.mk
index a57f8715c5..2a393a7e9c 100644
--- a/gst-plugins1-bad/options.mk
+++ b/gst-plugins1-bad/options.mk
@@ -1,6 +1,6 @@
# $NetBSD: options.mk,v 1.9 2019/10/03 20:45:19 nia Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.gstreamer1
+PKG_OPTIONS_VAR= PKG_OPTIONS.gst-plugins1-bad
PKG_SUPPORTED_OPTIONS= introspection
PKG_SUGGESTED_OPTIONS= introspection
diff --git a/gst-plugins1-base/DESCR b/gst-plugins1-base/DESCR
index 79c454b805..da5ef1634a 100644
--- a/gst-plugins1-base/DESCR
+++ b/gst-plugins1-base/DESCR
@@ -1,12 +1,6 @@
-GStreamer is a library that allows the construction of graphs of
-media-handling components, ranging from simple Ogg/Vorbis playback to
-complex audio (mixing) and video (non-linear editing) processing.
-
-Applications can take advantage of advances in codec and filter technology
-transparently. Developers can add new codecs and filters by writing a
-simple plugin with a clean, generic interface.
-
-GStreamer is released under the LGPL.
-
-This package is part of the 'base' plugins for GStreamer. It provides a
-set of must-have plugins.
+GStreamer Base Plug-ins is a well-groomed and well-maintained
+collection of GStreamer plug-ins and elements, spanning the range
+of possible types of elements one would want to write for GStreamer.
+It also contains helper libraries and base classes useful for
+writing elements. A wide range of video and audio decoders, encoders,
+and filters are included.
diff --git a/gst-plugins1-base/Makefile b/gst-plugins1-base/Makefile
index e0248cd6c0..264722430d 100644
--- a/gst-plugins1-base/Makefile
+++ b/gst-plugins1-base/Makefile
@@ -22,29 +22,28 @@ PYTHON_FOR_BUILD_ONLY= tool
MESON_ARGS+= -D gl_winsys=x11
+.include "options.mk"
+
# for tests
-MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gst-libs/gst/audio:${WRKSRC}/output/gst-libs/gst/video:${WRKSRC}/output/gst-libs/gst/tag:${WRKSRC}/output/gst-libs/gst/rtp:${WRKSRC}/output/gst-libs/gst/allocators:${WRKSRC}/output/gst-libs/gst/app:${WRKSRC}/output/gst-libs/gst/pbutils:${WRKSRC}/output/gst-libs/gst/gl:${WRKSRC}/output/gst-libs/ext/ogg:${WRKSRC}/output/gst-libs/ext/opus:${WRKSRC}/output/gst-libs/ext/theora:${WRKSRC}/output/gst-libs/ext/vorbis:${WRKSRC}/output/gst-libs/gst/riff:${WRKSRC}/output/gst-libs/gst/sdp:${WRKSRC}/output/gst-libs/gst/fft:${WRKSRC}/output/gst-libs/gst/rtsp
+# generate with:
+# find work/gst-*/ -name *.so | sed -e "s,/[^/]*$,:," -e 's,work/[^/]*/,${WRKSRC}/,' | tr -d \\n
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gst-libs/gst/tag:${WRKSRC}/output/gst-libs/gst/fft:${WRKSRC}/output/gst-libs/gst/video:${WRKSRC}/output/gst-libs/gst/audio:${WRKSRC}/output/gst-libs/gst/rtp:${WRKSRC}/output/gst-libs/gst/sdp:${WRKSRC}/output/gst-libs/gst/rtsp:${WRKSRC}/output/gst-libs/gst/pbutils:${WRKSRC}/output/gst-libs/gst/riff:${WRKSRC}/output/gst-libs/gst/app:${WRKSRC}/output/gst-libs/gst/allocators:${WRKSRC}/output/gst-libs/gst/gl:${WRKSRC}/output/gst/adder:${WRKSRC}/output/gst/app:${WRKSRC}/output/gst/audioconvert:${WRKSRC}/output/gst/audiomixer:${WRKSRC}/output/gst/audiorate:${WRKSRC}/output/gst/audioresample:${WRKSRC}/output/gst/audiotestsrc:${WRKSRC}/output/gst/compositor:${WRKSRC}/output/gst/encoding:${WRKSRC}/output/gst/gio:${WRKSRC}/output/gst/overlaycomposition:${WRKSRC}/output/gst/pbtypes:${WRKSRC}/output/gst/playback:${WRKSRC}/output/gst/rawparse:${WRKSRC}/output/gst/subparse:${WRKSRC}/output/gst/tcp:${WRKSRC}/output/gst/typefind:${WRKSRC}/output/gs
t/videoconvert:${WRKSRC}/output/gst/videorate:${WRKSRC}/output/gst/videoscale:${WRKSRC}/output/gst/videotestsrc:${WRKSRC}/output/gst/volume:${WRKSRC}/output/ext/cdparanoia:${WRKSRC}/output/ext/gl:${WRKSRC}/output/ext/libvisual:${WRKSRC}/output/ext/ogg:${WRKSRC}/output/ext/opus:${WRKSRC}/output/ext/pango:${WRKSRC}/output/ext/theora:${WRKSRC}/output/ext/vorbis:${WRKSRC}/output/sys/ximage:${WRKSRC}/output/sys/xvimage:${WRKSRC}/output/tests/examples/device-provider
# test status as of 1.18.5
-#Ok: 88
-#Expected Fail: 0
-#Fail: 14
-#Unexpected Pass: 0
-#Skipped: 14
-#Timeout: 0
+#Ok: 88
+#Expected Fail: 0
+#Fail: 14
+#Unexpected Pass: 0
+#Skipped: 14
+#Timeout: 0
.include "../../audio/cdparanoia/buildlink3.mk"
.include "../../audio/libopus/buildlink3.mk"
.include "../../audio/libvisual/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../devel/meson/build.mk"
.include "../../devel/orc/buildlink3.mk"
-.include "../../devel/pango/buildlink3.mk"
.include "../../lang/python/tool.mk"
-.include "../../mk/jpeg.buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../multimedia/libtheora/buildlink3.mk"
.include "../../wip/gstreamer1/buildlink3.mk"
diff --git a/gst-plugins1-base/PLIST b/gst-plugins1-base/PLIST
index 2198701816..cc87c17408 100644
--- a/gst-plugins1-base/PLIST
+++ b/gst-plugins1-base/PLIST
@@ -189,18 +189,18 @@ include/gstreamer-1.0/gst/video/video.h
include/gstreamer-1.0/gst/video/videodirection.h
include/gstreamer-1.0/gst/video/videoorientation.h
include/gstreamer-1.0/gst/video/videooverlay.h
-lib/girepository-1.0/GstAllocators-1.0.typelib
-lib/girepository-1.0/GstApp-1.0.typelib
-lib/girepository-1.0/GstAudio-1.0.typelib
-lib/girepository-1.0/GstGL-1.0.typelib
-lib/girepository-1.0/GstGLEGL-1.0.typelib
-lib/girepository-1.0/GstGLX11-1.0.typelib
-lib/girepository-1.0/GstPbutils-1.0.typelib
-lib/girepository-1.0/GstRtp-1.0.typelib
-lib/girepository-1.0/GstRtsp-1.0.typelib
-lib/girepository-1.0/GstSdp-1.0.typelib
-lib/girepository-1.0/GstTag-1.0.typelib
-lib/girepository-1.0/GstVideo-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstAllocators-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstApp-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstAudio-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstGL-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstGLEGL-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstGLX11-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstPbutils-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstRtp-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstRtsp-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstSdp-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstTag-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/GstVideo-1.0.typelib
lib/gstreamer-1.0/include/gst/gl/gstglconfig.h
lib/gstreamer-1.0/libgstadder.so
lib/gstreamer-1.0/libgstapp.so
@@ -289,18 +289,18 @@ lib/pkgconfig/gstreamer-video-1.0.pc
man/man1/gst-device-monitor-1.0.1
man/man1/gst-discoverer-1.0.1
man/man1/gst-play-1.0.1
-share/gir-1.0/GstAllocators-1.0.gir
-share/gir-1.0/GstApp-1.0.gir
-share/gir-1.0/GstAudio-1.0.gir
-share/gir-1.0/GstGL-1.0.gir
-share/gir-1.0/GstGLEGL-1.0.gir
-share/gir-1.0/GstGLX11-1.0.gir
-share/gir-1.0/GstPbutils-1.0.gir
-share/gir-1.0/GstRtp-1.0.gir
-share/gir-1.0/GstRtsp-1.0.gir
-share/gir-1.0/GstSdp-1.0.gir
-share/gir-1.0/GstTag-1.0.gir
-share/gir-1.0/GstVideo-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstAllocators-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstApp-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstAudio-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstGL-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstGLEGL-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstGLX11-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstPbutils-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstRtp-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstRtsp-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstSdp-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstTag-1.0.gir
+${PLIST.introspection}share/gir-1.0/GstVideo-1.0.gir
share/gst-plugins-base/1.0/license-translations.dict
share/locale/af/LC_MESSAGES/gst-plugins-base-1.0.mo
share/locale/az/LC_MESSAGES/gst-plugins-base-1.0.mo
diff --git a/gst-plugins1-base/buildlink3.mk b/gst-plugins1-base/buildlink3.mk
index 8e0f3a9f74..9a4bc563bf 100644
--- a/gst-plugins1-base/buildlink3.mk
+++ b/gst-plugins1-base/buildlink3.mk
@@ -10,7 +10,6 @@ BUILDLINK_ABI_DEPENDS.gst-plugins1-base+= gst-plugins1-base>=1.18
BUILDLINK_PKGSRCDIR.gst-plugins1-base?= ../../wip/gst-plugins1-base
.include "../../wip/gstreamer1/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../devel/orc/buildlink3.mk"
.endif # GST_PLUGINS1_BASE_BUILDLINK3_MK
diff --git a/gst-plugins1-base/options.mk b/gst-plugins1-base/options.mk
new file mode 100644
index 0000000000..b85b3d6875
--- /dev/null
+++ b/gst-plugins1-base/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.9 2019/10/03 20:45:19 nia Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.gst-plugins1-base
+PKG_SUPPORTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS= introspection
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= introspection
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+PLIST.introspection= yes
+.else
+MESON_ARGS+= -D introspection=disabled
+.endif
diff --git a/gst-plugins1-good/Makefile b/gst-plugins1-good/Makefile
index 1f988e745f..a8cc8e1794 100644
--- a/gst-plugins1-good/Makefile
+++ b/gst-plugins1-good/Makefile
@@ -23,12 +23,12 @@ PYTHON_FOR_BUILD_ONLY= tool
LDFLAGS+= ${LIBOSSAUDIO}
# test status as of 1.18.5
-#Ok: 104
-#Expected Fail: 0
-#Fail: 1
-#Unexpected Pass: 0
-#Skipped: 0
-#Timeout: 0
+#Ok: 104
+#Expected Fail: 0
+#Fail: 1
+#Unexpected Pass: 0
+#Skipped: 0
+#Timeout: 0
#
#105/105 generic_states FAIL 40.92s exit status 2
diff --git a/gstreamer1/Makefile b/gstreamer1/Makefile
index 405c253bb3..b8725d84a7 100644
--- a/gstreamer1/Makefile
+++ b/gstreamer1/Makefile
@@ -15,6 +15,8 @@ USE_TOOLS+= bison flex perl pkg-config
TEST_TARGET= check
FLEX_REQD= 2.5.31
+PYTHON_FOR_BUILD_ONLY= tool
+
.include "options.mk"
PKGCONFIG_OVERRIDE+= pkgconfig/gstreamer-controller.pc.in
diff --git a/gstreamer1/PLIST b/gstreamer1/PLIST
index f0e5574566..d11cfffa5d 100644
--- a/gstreamer1/PLIST
+++ b/gstreamer1/PLIST
@@ -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
+share/aclocal/gst-element-check-1.0.m4
+share/gdb/auto-load/usr/pkg/lib/libgstreamer-1.0.so.0.1805.0-gdb.py
${PLIST.introspection}share/gir-1.0/Gst-1.0.gir
${PLIST.introspection}share/gir-1.0/GstBase-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
Home |
Main Index |
Thread Index |
Old Index