git: 8c1efc578d6f - main - multimedia/gstreamer1: Update to 1.24.8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 22 Sep 2024 10:39:48 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8c1efc578d6f6e5fc6371bf22d3983675f636b44
commit 8c1efc578d6f6e5fc6371bf22d3983675f636b44
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-09-22 08:31:12 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-09-22 10:35:56 +0000
multimedia/gstreamer1: Update to 1.24.8
Mk/Uses/gstreamer.mk:
- Sort, fix whitespace issues and typos
- Promote several common variables to improve maintainer QOL
* There's now no need to set manually set PORTVERSION nor
SOVERSION in several Makefiles
* This will help to prevent not updating some components
* A note has been added, however, to remind maintainers
to remake distinfo for certain ports
- Improve documentation
multimedia/gstreamer1-plugins-webrtc:
- New port split from multimedia/gstreamer1-plugins-bad
- multimedia/gstreamer1-plugins-rust has been updated
to reflect this change
net/gstreamer1-plugins-sctp:
- New port split from multimedia/gstreamer1-plugins-bad
x11-toolkits/gstreamer1-plugins-qt5:
- Moved here from graphics/gstreamer1-plugins-qt to
align with its new Qt6 counterpart
x11-toolkits/gstreamer1-plugins-qt6:
- New port: GStreamer Qt6 QML videosink plugin
*/*:
- Improve Makefile order and formatting
- Sorry for the repo churn, but not fixing this would just lead to more
poorly formatted gstreamer ports in the future via copypasta
https://gstreamer.freedesktop.org/releases/1.24/#1.24.8
PR: 278914
Reported by: vvd
---
MOVED | 1 +
Mk/Uses/gstreamer.mk | 172 +++++++++++++--------
audio/gstreamer1-plugins-a52dec/Makefile | 12 +-
audio/gstreamer1-plugins-amrnb/Makefile | 12 +-
audio/gstreamer1-plugins-amrwbdec/Makefile | 13 +-
audio/gstreamer1-plugins-bs2b/Makefile | 13 +-
audio/gstreamer1-plugins-cdparanoia/Makefile | 10 +-
audio/gstreamer1-plugins-chromaprint/Makefile | 10 +-
audio/gstreamer1-plugins-faac/Makefile | 10 +-
audio/gstreamer1-plugins-faad/Makefile | 12 +-
audio/gstreamer1-plugins-flac/Makefile | 10 +-
audio/gstreamer1-plugins-flite/Makefile | 10 +-
audio/gstreamer1-plugins-gme/Makefile | 12 +-
audio/gstreamer1-plugins-gsm/Makefile | 10 +-
audio/gstreamer1-plugins-jack/Makefile | 10 +-
audio/gstreamer1-plugins-ladspa/Makefile | 13 +-
audio/gstreamer1-plugins-lame/Makefile | 10 +-
audio/gstreamer1-plugins-lv2/Makefile | 20 ++-
audio/gstreamer1-plugins-modplug/Makefile | 10 +-
audio/gstreamer1-plugins-mpg123/Makefile | 10 +-
audio/gstreamer1-plugins-ogg/Makefile | 10 +-
audio/gstreamer1-plugins-openmpt/Makefile | 10 +-
audio/gstreamer1-plugins-opus/Makefile | 10 +-
audio/gstreamer1-plugins-pulse/Makefile | 12 +-
audio/gstreamer1-plugins-shout2/Makefile | 10 +-
audio/gstreamer1-plugins-sidplay/Makefile | 12 +-
audio/gstreamer1-plugins-sndfile/Makefile | 10 +-
audio/gstreamer1-plugins-soundtouch/Makefile | 11 +-
audio/gstreamer1-plugins-speex/Makefile | 10 +-
audio/gstreamer1-plugins-taglib/Makefile | 16 +-
audio/gstreamer1-plugins-twolame/Makefile | 10 +-
audio/gstreamer1-plugins-vorbis/Makefile | 13 +-
audio/gstreamer1-plugins-wavpack/Makefile | 10 +-
audio/gstreamer1-plugins-webrtcdsp/Makefile | 10 +-
comms/gstreamer1-plugins-spandsp/Makefile | 10 +-
devel/gstreamer1-plugins-soup/Makefile | 10 +-
ftp/gstreamer1-plugins-curl/Makefile | 12 +-
graphics/Makefile | 1 -
graphics/gstreamer1-plugins-aalib/Makefile | 12 +-
graphics/gstreamer1-plugins-cairo/Makefile | 10 +-
graphics/gstreamer1-plugins-gdkpixbuf/Makefile | 10 +-
graphics/gstreamer1-plugins-gl/Makefile | 45 +++---
graphics/gstreamer1-plugins-gl/pkg-plist | 2 +
graphics/gstreamer1-plugins-jpeg/Makefile | 12 +-
graphics/gstreamer1-plugins-kms/Makefile | 10 +-
graphics/gstreamer1-plugins-libcaca/Makefile | 10 +-
graphics/gstreamer1-plugins-libvisual/Makefile | 10 +-
graphics/gstreamer1-plugins-opencv/Makefile | 15 +-
graphics/gstreamer1-plugins-openexr/Makefile | 15 +-
graphics/gstreamer1-plugins-openjpeg/Makefile | 10 +-
graphics/gstreamer1-plugins-png/Makefile | 10 +-
graphics/gstreamer1-plugins-qt/Makefile | 19 ---
graphics/gstreamer1-plugins-rsvg/Makefile | 10 +-
graphics/gstreamer1-plugins-vulkan/Makefile | 30 ++--
graphics/gstreamer1-plugins-vulkan/pkg-plist | 8 +
graphics/gstreamer1-plugins-webp/Makefile | 10 +-
graphics/gstreamer1-plugins-zbar/Makefile | 10 +-
multimedia/Makefile | 1 +
multimedia/gstreamer1-editing-services/Makefile | 13 +-
multimedia/gstreamer1-editing-services/distinfo | 6 +-
multimedia/gstreamer1-editing-services/pkg-plist | 6 +-
multimedia/gstreamer1-libav/Makefile | 8 +-
multimedia/gstreamer1-libav/distinfo | 6 +-
multimedia/gstreamer1-plugins-all/Makefile | 2 +-
multimedia/gstreamer1-plugins-aom/Makefile | 10 +-
multimedia/gstreamer1-plugins-assrender/Makefile | 13 +-
multimedia/gstreamer1-plugins-bad/Makefile | 40 +++--
.../files/patch-ext_dtls_meson.build | 11 ++
.../files/patch-ext_sctp_meson.build | 11 ++
.../files/patch-ext_srtp_meson.build | 11 ++
.../files/patch-ext_vulkan_meson.build | 11 ++
.../files/patch-ext_webrtc_meson.build | 27 +++-
.../files/patch-ext_webrtcdsp_meson.build | 10 +-
.../files/patch-gst-libs_gst_analytics_meson.build | 12 ++
.../files/patch-gst-libs_gst_audio_meson.build | 4 +-
...patch-gst-libs_gst_basecamerabinsrc_meson.build | 4 +-
.../patch-gst-libs_gst_codecparsers_meson.build | 4 +-
.../files/patch-gst-libs_gst_codecs_meson.build | 23 ++-
.../files/patch-gst-libs_gst_dxva_meson.build | 12 ++
.../files/patch-gst-libs_gst_insertbin_meson.build | 4 +-
.../files/patch-gst-libs_gst_mpegts_meson.build | 4 +-
.../files/patch-gst-libs_gst_mse_meson.build | 12 ++
.../files/patch-gst-libs_gst_play_meson.build | 4 +-
.../files/patch-gst-libs_gst_player_meson.build | 4 +-
.../patch-gst-libs_gst_transcoder_meson.build | 4 +-
.../files/patch-gst-libs_gst_va_meson.build | 25 ++-
.../files/patch-gst-libs_gst_webrtc_meson.build | 9 +-
.../gstreamer1-plugins-bad/files/patch-meson.build | 6 +-
.../files/patch-meson__options.txt | 10 +-
.../files/patch-sys_kms_meson.build | 10 +-
.../files/patch-sys_msdk_meson.build | 6 +-
.../files/patch-tests_examples_meson.build | 16 +-
.../files/patch-tests_meson.build | 13 ++
.../files/patch-tools_meson.build | 28 ++--
multimedia/gstreamer1-plugins-bad/pkg-plist | 76 ++++-----
multimedia/gstreamer1-plugins-core/Makefile | 28 ++--
multimedia/gstreamer1-plugins-dash/Makefile | 10 +-
multimedia/gstreamer1-plugins-dts/Makefile | 12 +-
multimedia/gstreamer1-plugins-dv/Makefile | 10 +-
multimedia/gstreamer1-plugins-dvdread/Makefile | 14 +-
multimedia/gstreamer1-plugins-good/Makefile | 13 +-
.../files/patch-ext_qt6_meson.build | 11 ++
.../files/patch-ext_qt_meson.build | 11 ++
.../files/patch-sys_v4l2_gstv4l2object.c | 12 ++
.../files/patch-sys_v4l2_v4l2__calls.c | 4 +-
multimedia/gstreamer1-plugins-hls/Makefile | 10 +-
multimedia/gstreamer1-plugins-libde265/Makefile | 10 +-
multimedia/gstreamer1-plugins-mpeg2dec/Makefile | 14 +-
multimedia/gstreamer1-plugins-mpeg2enc/Makefile | 16 +-
multimedia/gstreamer1-plugins-mplex/Makefile | 18 +--
multimedia/gstreamer1-plugins-msdk/Makefile | 20 +--
multimedia/gstreamer1-plugins-openh264/Makefile | 10 +-
multimedia/gstreamer1-plugins-resindvd/Makefile | 16 +-
multimedia/gstreamer1-plugins-rust/Makefile | 4 +-
.../gstreamer1-plugins-smoothstreaming/Makefile | 12 +-
multimedia/gstreamer1-plugins-theora/Makefile | 12 +-
multimedia/gstreamer1-plugins-ttml/Makefile | 10 +-
multimedia/gstreamer1-plugins-ugly/Makefile | 11 +-
multimedia/gstreamer1-plugins-v4l2/Makefile | 15 +-
multimedia/gstreamer1-plugins-vpx/Makefile | 12 +-
multimedia/gstreamer1-plugins-webrtc/Makefile | 17 ++
multimedia/gstreamer1-plugins-webrtc/pkg-plist | 28 ++++
multimedia/gstreamer1-plugins-x264/Makefile | 14 +-
multimedia/gstreamer1-plugins-x265/Makefile | 16 +-
multimedia/gstreamer1-plugins/Makefile | 91 ++++++-----
multimedia/gstreamer1-plugins/Makefile.common | 66 +++++++-
multimedia/gstreamer1-plugins/distinfo | 18 +--
.../files/patch-ext_cdparanoia_gstcdparanoiasrc.c | 8 +-
.../files/patch-ext_cdparanoia_meson.build | 4 +-
.../files/patch-ext_gl_meson.build | 6 +-
.../patch-gst-libs_gst_allocators_meson.build | 4 +-
.../files/patch-gst-libs_gst_app_meson.build | 6 +-
.../files/patch-gst-libs_gst_audio_meson.build | 4 +-
.../files/patch-gst-libs_gst_gl_meson.build | 20 +--
.../files/patch-gst-libs_gst_pbutils_meson.build | 9 +-
.../files/patch-gst-libs_gst_rtp_meson.build | 4 +-
.../files/patch-gst-libs_gst_rtsp_meson.build | 4 +-
.../files/patch-gst-libs_gst_sdp_meson.build | 4 +-
.../files/patch-gst-libs_gst_tag_meson.build | 4 +-
.../files/patch-gst-libs_gst_video_meson.build | 4 +-
.../gstreamer1-plugins/files/patch-meson.build | 8 +-
.../files/patch-tools_meson.build | 4 +-
multimedia/gstreamer1-plugins/pkg-plist | 13 +-
multimedia/gstreamer1-rtsp-server/Makefile | 10 +-
multimedia/gstreamer1-rtsp-server/distinfo | 6 +-
multimedia/gstreamer1-vaapi/Makefile | 5 +-
multimedia/gstreamer1-vaapi/distinfo | 6 +-
multimedia/gstreamer1/Makefile | 59 ++++---
multimedia/gstreamer1/distinfo | 6 +-
multimedia/gstreamer1/pkg-plist | 4 +-
net/Makefile | 1 +
net/gstreamer1-plugins-sctp/Makefile | 13 ++
net/gstreamer1-plugins-sctp/pkg-plist | 8 +
net/gstreamer1-plugins-srtp/Makefile | 10 +-
security/gstreamer1-plugins-dtls/Makefile | 10 +-
sysutils/gstreamer1-plugins-cdio/Makefile | 14 +-
textproc/gstreamer1-plugins-zxing/Makefile | 8 +-
textproc/gstreamer1-plugins-zxing/distinfo | 5 -
www/gstreamer1-plugins-neon/Makefile | 12 +-
www/gstreamer1-plugins-srt/Makefile | 10 +-
x11-toolkits/Makefile | 2 +
x11-toolkits/gstreamer1-plugins-gtk/Makefile | 18 +--
x11-toolkits/gstreamer1-plugins-pango/Makefile | 14 +-
x11-toolkits/gstreamer1-plugins-qt5/Makefile | 27 ++++
.../gstreamer1-plugins-qt5}/pkg-plist | 0
x11-toolkits/gstreamer1-plugins-qt6/Makefile | 26 ++++
x11-toolkits/gstreamer1-plugins-qt6/pkg-plist | 1 +
x11/gstreamer1-plugins-x/Makefile | 20 +--
x11/gstreamer1-plugins-ximagesrc/Makefile | 21 ++-
169 files changed, 1356 insertions(+), 932 deletions(-)
diff --git a/MOVED b/MOVED
index 44f226b1025e..84800032a281 100644
--- a/MOVED
+++ b/MOVED
@@ -3482,3 +3482,4 @@ databases/ldb15||2024-09-18|Has expired: Outdated and not necessary for any supp
net/rubygem-kas-grpc|net/rubygem-gitlab-kas-grpc|2024-09-19|Renamed, use net/rubygem-gitlab-kas-grpc instead
databases/ldb20||2024-09-22|Has expired: Outdated and not necessary for any supported version of Samba
databases/ldb21||2024-09-22|Has expired: Outdated and not necessary for any supported version of Samba
+graphics/gstreamer1-plugins-qt|x11-toolkits/gstreamer1-plugins-qt5|2024-09-21|Rename with versioned suffix and move to a more fitting category with the addition of its Qt6 counterpart
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
index 42558da3308d..4c4e4d4f6a45 100644
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -1,12 +1,18 @@
+# Support for GStreamer-related libraries and plugins
#
-# gstreamer.mk - Support for gstreamer-plugins-based ports.
-#
+# Feature: gstreamer
# Usage:
-# USES= gstreamer[:version]
-# USE_GSTREAMER= [list of components]
+# USES= gstreamer[:version][,arg,...]
+# USE_GSTREAMER= [list of components]
+#
+# Valid ARGS: <version>, _internal
+#
+# version: 1 -- default (this may be omitted since there is
+# currently only one supported version)
+# _internal: Only intended for use by multimedia/gstreamer1 to
+# define specific variables so as not depend on itself
#
-# Supported versions: 1 -- default
-# #
+# MAINTAINER: multimedia@FreeBSD.org
.if ! defined(_INCLUDE_USES_GSTREAMER_MK)
_INCLUDE_USES_GSTREAMER_MK= YES
@@ -22,7 +28,7 @@ _GST_VER= #
. if empty(_GST_VER)
_GST_VER= ${ver}
. else
-INGORE= Incorrect USES=gstreamer:${gstramer_ARGS} - multiple versions defined
+IGNORE= Incorrect USES=gstreamer:${gstreamer_ARGS} - multiple versions defined
. endif
. endif
. endfor
@@ -33,8 +39,16 @@ _GST_VER= ${_GST_VER_DEFAULT}
#== Component setup
-_GST1_VERSION= 1.22.10
+# When modifying _GST1_VERSION, be sure to also update distinfo for the
+# following ports:
+# - multimedia/gstreamer1
+# - multimedia/gstreamer1-editing-services
+# - multimedia/gstreamer1-plugins (via `make makesum-gst1`)
+# - multimedia/gstreamer1-rtsp-server
+# - multimedia/gstreamer1-vaapi
+_GST1_VERSION= 1.24.8
_GST1_LIB_VER= 1.0
+_GST1_SOVERSION= 0.${_GST1_VERSION:R:E}${${_GST1_VERSION:E} > 9:?:0}${_GST1_VERSION:E}.0
_GST1_CATEGORIES= audio comms devel ftp graphics multimedia net security \
sysutils www x11 x11-toolkits
@@ -46,19 +60,20 @@ _GST1_PLUGINS_audio= a52dec amrnb amrwbdec bs2b cdparanoia chromaprint faac \
_GST1_PLUGINS_comms= spandsp
_GST1_PLUGINS_devel= soup
_GST1_PLUGINS_ftp= curl
-_GST1_PLUGINS_graphics= aalib cairo gdkpixbuf gl jpeg kms libcaca libvisual \
- opencv openexr openjpeg png qt rsvg vulkan webp zbar
+_GST1_PLUGINS_graphics= aalib cairo gdkpixbuf gl jpeg kms libcaca libvisual \
+ opencv openexr openjpeg png rsvg vulkan webp zbar
_GST1_PLUGINS_multimedia= aom assrender bad dash dts dv dvdread \
editing-services gnonlin good hls libav libde265 \
- mpeg2dec mpeg2enc mplex mm openh264 resindvd \
- smoothstreaming theora ttml ugly v4l2 vpx x264 x265 \
- zxing
-_GST1_PLUGINS_net= srtp
+ mpeg2dec mpeg2enc mplex mm msdk openh264 resindvd \
+ smoothstreaming theora ttml ugly v4l2 vaapi vpx webrtc \
+ x264 x265
+_GST1_PLUGINS_net= sctp srtp
_GST1_PLUGINS_security= dtls
_GST1_PLUGINS_sysutils= cdio
-_GST1_PLUGINS_www= neon
+_GST1_PLUGINS_textproc= zxing
+_GST1_PLUGINS_www= neon srt
_GST1_PLUGINS_x11= x ximagesrc
-_GST1_PLUGINS_x11-toolkits= gtk pango
+_GST1_PLUGINS_x11-toolkits= gtk pango qt5 qt6
# == Unversioned information
@@ -67,6 +82,8 @@ _GST_PLUGINS_BASE= bad core good ugly libgstreamer plugins
_GST_PLUGINS_VER:= ${_GST${_GST_VER}_CATEGORIES:S/^/\${_GST${_GST_VER}_PLUGINS_/:S/$/}/}
_GST_VERSION= ${_GST${_GST_VER}_VERSION}
+_GST_LIB_VER= ${_GST${_GST_VER}_LIB_VER}
+_GST_SOVERSION= ${_GST${_GST_VER}_SOVERSION}
# List of all available components
_USE_GSTREAMER_ALL= ${_GST_PLUGINS_BASE} \
@@ -85,7 +102,7 @@ gst-bad_IMPL= #
gst-core_PORT= multimedia/gstreamer${_GST_VER}-plugins-core
gst-core_IMPL= #
-gst-core_GST1_VERSION= 1.16
+gst-core_GST1_VERSION= 1.24
gst-core_VERSION= ${gst-core_GST${_GST_VER}_VERSION}
gst-good_PORT= multimedia/gstreamer${_GST_VER}-plugins-good
@@ -97,7 +114,7 @@ gst-ugly_IMPL= #
gst-libgstreamer_LIB= libgstreamer${_GST${_GST_VER}_LIB_VER:D-${_GST${_GST_VER}_LIB_VER}}.so
gst-libgstreamer_PORT= multimedia/gstreamer${_GST_VER}
-#==== Audio Plugins Section
+#==== audio plugins section
gst-a52dec_PORT= audio/gstreamer${_GST_VER}-plugins-a52dec
gst-a52dec_IMPL= ugly
@@ -153,12 +170,12 @@ gst-modplug_IMPL= bad
gst-mpg123_PORT= audio/gstreamer${_GST_VER}-plugins-mpg123
gst-mpg123_IMPL= ugly
-gst-neon_PORT= www/gstreamer${_GST_VER}-plugins-neon
-gst-neon_IMPL= bad
-
gst-ogg_PORT= audio/gstreamer${_GST_VER}-plugins-ogg
gst-ogg_IMPL= #
+gst-openmpt_PORT= audio/gstreamer${_GST_VER}-plugins-openmpt
+gst-openmpt_IMPL= bad
+
gst-opus_PORT= audio/gstreamer${_GST_VER}-plugins-opus
gst-opus_IMPL= #
@@ -171,13 +188,13 @@ gst-shout2_IMPL= good
gst-sidplay_PORT= audio/gstreamer${_GST_VER}-plugins-sidplay
gst-sidplay_IMPL= ugly
+gst-sndfile_PORT= audio/gstreamer${_GST_VER}-plugins-sndfile
+gst-sndfile_IMPL= bad
+
gst-sndio_PORT= audio/gstreamer${_GST_VER}-plugins-sndio
gst-sndio_IMPL= #
gst-sndio_VERSION= 1.8.0
-gst-sndfile_PORT= audio/gstreamer${_GST_VER}-plugins-sndfile
-gst-sndfile_IMPL= bad
-
gst-soundtouch_PORT= audio/gstreamer${_GST_VER}-plugins-soundtouch
gst-soundtouch_IMPL= bad
@@ -219,12 +236,6 @@ gst-curl_IMPL= bad
gst-aalib_PORT= graphics/gstreamer${_GST_VER}-plugins-aalib
gst-aalib_IMPL= good
-gst-aom_PORT= multimedia/gstreamer${_GST_VER}-plugins-aom
-gst-aom_IMPL= bad
-
-gst-assrender_PORT= multimedia/gstreamer${_GST_VER}-plugins-assrender
-gst-assrender_IMPL= bad
-
gst-cairo_PORT= graphics/gstreamer${_GST_VER}-plugins-cairo
gst-cairo_IMPL= good
@@ -255,18 +266,15 @@ gst-openexr_IMPL= bad
gst-openjpeg_PORT= graphics/gstreamer${_GST_VER}-plugins-openjpeg
gst-openjpeg_IMPL= bad
-gst-openmpt_PORT= audio/gstreamer${_GST_VER}-plugins-openmpt
-gst-openmpt_IMPL= bad
-
gst-png_PORT= graphics/gstreamer${_GST_VER}-plugins-png
gst-png_IMPL= good
-gst-qt_PORT= graphics/gstreamer${_GST_VER}-plugins-qt
-gst-qt_IMPL= good
-
gst-rsvg_PORT= graphics/gstreamer${_GST_VER}-plugins-rsvg
gst-rsvg_IMPL= bad
+gst-vulkan_PORT= graphics/gstreamer${_GST_VER}-plugins-vulkan
+gst-vulkan_IMPL= bad
+
gst-webp_PORT= graphics/gstreamer${_GST_VER}-plugins-webp
gst-webp_IMPL= bad
@@ -275,22 +283,28 @@ gst-zbar_IMPL= bad
#==== multimedia plugins section
+gst-aom_PORT= multimedia/gstreamer${_GST_VER}-plugins-aom
+gst-aom_IMPL= bad
+
+gst-assrender_PORT= multimedia/gstreamer${_GST_VER}-plugins-assrender
+gst-assrender_IMPL= bad
+
gst-dash_PORT= multimedia/gstreamer${_GST_VER}-plugins-dash
gst-dash_IMPL= bad
gst-dvdread_PORT= multimedia/gstreamer${_GST_VER}-plugins-dvdread
gst-dvdread_IMPL= ugly
-gst-editing-services_PORT= multimedia/gstreamer${_GST_VER}-editing-services
-gst-editing-services_SUFFIX= #
-gst-editing-services_IMPL= #
-
gst-dts_PORT= multimedia/gstreamer${_GST_VER}-plugins-dts
gst-dts_IMPL= bad
gst-dv_PORT= multimedia/gstreamer${_GST_VER}-plugins-dv
gst-dv_IMPL= good
+gst-editing-services_PORT= multimedia/gstreamer${_GST_VER}-editing-services
+gst-editing-services_SUFFIX= #
+gst-editing-services_IMPL= #
+
gst-gnonlin_PORT= multimedia/gstreamer${_GST_VER}-plugins-gnonlin
gst-gnonlin_IMPL= good
gst-gnonlin_VERSION= 1.4.0
@@ -321,33 +335,36 @@ gst-mpeg2enc_IMPL= bad
gst-mplex_PORT= multimedia/gstreamer${_GST_VER}-plugins-mplex
gst-mplex_IMPL= bad
+gst-msdk_PORT= multimedia/gstreamer${_GST_VER}-plugins-msdk
+gst-msdk_IMPL= bad
+
gst-openh264_PORT= multimedia/gstreamer${_GST_VER}-plugins-openh264
gst-openh264_IMPL= bad
+gst-resindvd_PORT= multimedia/gstreamer${_GST_VER}-plugins-resindvd
+gst-resindvd_IMPL= bad
+
gst-smoothstreaming_PORT= multimedia/gstreamer${_GST_VER}-plugins-smoothstreaming
gst-smoothstreaming_IMPL= bad
+gst-theora_PORT= multimedia/gstreamer${_GST_VER}-plugins-theora
+gst-theora_IMPL= #
+
gst-ttml_PORT= multimedia/gstreamer${_GST_VER}-plugins-ttml
gst-ttml_IMPL= bad
gst-v4l2_PORT= multimedia/gstreamer${_GST_VER}-plugins-v4l2
gst-v4l2_IMPL= good
-# hmmm
-gst-vaapi_PORT= multimedia/gstreamer-vaapi
-gst-vaapi_IMPL= bad
+gst-vaapi_PORT= multimedia/gstreamer${_GST_VER}-vaapi
+gst-vaapi_SUFFIX= #
+gst-vaapi_IMPL= #
gst-vpx_PORT= multimedia/gstreamer${_GST_VER}-plugins-vpx
gst-vpx_IMPL= good
-gst-vulkan_PORT= graphics/gstreamer${_GST_VER}-plugins-vulkan
-gst-vulkan_IMPL= bad
-
-gst-resindvd_PORT= multimedia/gstreamer${_GST_VER}-plugins-resindvd
-gst-resindvd_IMPL= bad
-
-gst-theora_PORT= multimedia/gstreamer${_GST_VER}-plugins-theora
-gst-theora_IMPL= #
+gst-webrtc_PORT= multimedia/gstreamer${_GST_VER}-plugins-webrtc
+gst-webrtc_IMPL= bad
gst-x264_PORT= multimedia/gstreamer${_GST_VER}-plugins-x264
gst-x264_IMPL= ugly
@@ -355,10 +372,10 @@ gst-x264_IMPL= ugly
gst-x265_PORT= multimedia/gstreamer${_GST_VER}-plugins-x265
gst-x265_IMPL= bad
-gst-zxing_PORT= textproc/gstreamer${_GST_VER}-plugins-zxing
-gst-zxing_IMPL= bad
+#==== net plugins section
-#==== Net Plugins Section
+gst-sctp_PORT= net/gstreamer${_GST_VER}-plugins-sctp
+gst-sctp_IMPL= bad
gst-srtp_PORT= net/gstreamer${_GST_VER}-plugins-srtp
gst-srtp_IMPL= bad
@@ -373,6 +390,19 @@ gst-dtls_IMPL= bad
gst-cdio_PORT= sysutils/gstreamer${_GST_VER}-plugins-cdio
gst-cdio_IMPL= ugly
+#==== textproc plugins section
+
+gst-zxing_PORT= textproc/gstreamer${_GST_VER}-plugins-zxing
+gst-zxing_IMPL= bad
+
+#==== www plugins section
+
+gst-neon_PORT= www/gstreamer${_GST_VER}-plugins-neon
+gst-neon_IMPL= bad
+
+gst-srt_PORT= www/gstreamer${_GST_VER}-plugins-srt
+gst-srt_IMPL= bad
+
#==== x11 plugins section
gst-x_PORT= x11/gstreamer${_GST_VER}-plugins-x
@@ -389,26 +419,33 @@ gst-gtk_IMPL= bad
gst-pango_PORT= x11-toolkits/gstreamer${_GST_VER}-plugins-pango
gst-pango_IMPL= #
+gst-qt5_PORT= x11-toolkits/gstreamer${_GST_VER}-plugins-qt5
+gst-qt5_IMPL= good
+
+gst-qt6_PORT= x11-toolkits/gstreamer${_GST_VER}-plugins-qt6
+gst-qt6_IMPL= good
+
#== Dependency creation
+. if empty(gstreamer_ARGS:M_internal)
_GST_BR_DEPENDS= #
_GST_LIB_DEPENDS= #
USE_GSTREAMER?= #
# everything wants this
USE_GSTREAMER+= libgstreamer
-. if ${PORTDIRNAME} != gstreamer${_GST_VER}-plugins
+. if ${PORTDIRNAME} != gstreamer${_GST_VER}-plugins
USE_GSTREAMER+= plugins
-. endif
+. endif
# Gather all Impl values
-_GST_IMPL_LIST:= ${USE_GSTREAMER:S/^/\${gst-/:S/$/_IMPL}/}
+_GST_IMPL_LIST:= ${USE_GSTREAMER:S/^/\${gst-/:S/$/_IMPL}/}
# Combine the wanted copmonents and the required implementations
_USE_GSTREAMER= ${USE_GSTREAMER} \
${_GST_IMPL_LIST}
-. for component in ${_USE_GSTREAMER:O:u}
+. for component in ${_USE_GSTREAMER:O:u}
# Fill in the common default component values
gst-${component}_VERSION?= ${_GST_VERSION}
gst-${component}_NAME?= ${component}
@@ -416,18 +453,19 @@ gst-${component}_PREFIX?= gstreamer${_GST_VER}-
gst-${component}_SUFFIX?= plugins-
gst-${component}_PKG?= ${gst-${component}_PREFIX}${gst-${component}_SUFFIX}${gst-${component}_NAME}
-. if empty(_USE_GSTREAMER_ALL:M${component})
+. if empty(_USE_GSTREAMER_ALL:M${component})
IGNORE= unknown gstreamer component '${component}' for gstreamer:${_GST_VER}
-. endif
-. if !empty(gst-${component}_LIB)
+. endif
+. if !empty(gst-${component}_LIB)
_GST_LIB_DEPENDS+= ${gst-${component}_LIB}:${gst-${component}_PORT}
-. else
+. else
_GST_BR_DEPENDS+= ${gst-${component}_PKG}>=${gst-${component}_VERSION}:${gst-${component}_PORT}
-. endif
-. endfor
+. endif
+. endfor
-LIB_DEPENDS+= ${_GST_LIB_DEPENDS:O:u}
-BUILD_DEPENDS+= ${_GST_BR_DEPENDS:O:u}
-RUN_DEPENDS+= ${_GST_BR_DEPENDS:O:u}
+LIB_DEPENDS+= ${_GST_LIB_DEPENDS:O:u}
+BUILD_DEPENDS+= ${_GST_BR_DEPENDS:O:u}
+RUN_DEPENDS+= ${_GST_BR_DEPENDS:O:u}
+. endif
.endif
diff --git a/audio/gstreamer1-plugins-a52dec/Makefile b/audio/gstreamer1-plugins-a52dec/Makefile
index 7b743eb76a34..81638fd0a539 100644
--- a/audio/gstreamer1-plugins-a52dec/Makefile
+++ b/audio/gstreamer1-plugins-a52dec/Makefile
@@ -3,15 +3,15 @@ CATEGORIES= audio
COMMENT= GStreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
-GST_PLUGIN= a52dec
-DIST= ugly
+LIB_DEPENDS= liba52.so:audio/liba52
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MESON_ARGS+= -Dgpl=enabled
-MESON_ARGS+= -Dgpl=enabled
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= liba52.so:audio/liba52
+DIST= ugly
+GST_PLUGIN= a52dec
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-amrnb/Makefile b/audio/gstreamer1-plugins-amrnb/Makefile
index fc4c144ead72..289e6250fbe5 100644
--- a/audio/gstreamer1-plugins-amrnb/Makefile
+++ b/audio/gstreamer1-plugins-amrnb/Makefile
@@ -3,15 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin
-GST_PLUGIN= amrnb
-DIST= ugly
-
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
-MESON_ARGS+= -Dgpl=enabled
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
+DIST= good
+GST_PLUGIN= amrnb
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-amrwbdec/Makefile b/audio/gstreamer1-plugins-amrwbdec/Makefile
index b851ca985326..01c4c00cdb42 100644
--- a/audio/gstreamer1-plugins-amrwbdec/Makefile
+++ b/audio/gstreamer1-plugins-amrwbdec/Makefile
@@ -1,18 +1,15 @@
PORTREVISION= 0
CATEGORIES= audio
-PKGNAMESUFFIX= 1-plugins-amrwbdec
COMMENT= GStreamer OpenCore based Adaptive Multi-Rate Wide-Band Decoder plugin
-GST_PLUGIN= amrwbdec
-DIST= ugly
-
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
-MESON_ARGS+= -Dgpl=enabled
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
+DIST= good
+GST_PLUGIN= amrwbdec
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-bs2b/Makefile b/audio/gstreamer1-plugins-bs2b/Makefile
index 80da3eeaf9f6..f1aba182cc9e 100644
--- a/audio/gstreamer1-plugins-bs2b/Makefile
+++ b/audio/gstreamer1-plugins-bs2b/Makefile
@@ -3,14 +3,15 @@ CATEGORIES= audio
COMMENT= GStreamer Bauer Stereophonic to Banaural BSP (bs2b) plugin
-GST_PLUGIN= bs2b
-DIST= bad
+LIB_DEPENDS= libbs2b.so:audio/libbs2b
+
+MESON_ARGS+= -Dgpl=enabled
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libbs2b.so:audio/libbs2b
+PLIST= ${.CURDIR}/pkg-plist
-MESON_ARGS+= -Dgpl=enabled
+DIST= bad
+GST_PLUGIN= bs2b
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-cdparanoia/Makefile b/audio/gstreamer1-plugins-cdparanoia/Makefile
index 25b57c3b437b..2046b9ea3d5c 100644
--- a/audio/gstreamer1-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer1-plugins-cdparanoia/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer CDDA extraction (aka audio ripping) plugin
-GST_PLUGIN= cdparanoia
-DIST= base
+LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia
+DIST= base
+GST_PLUGIN= cdparanoia
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-chromaprint/Makefile b/audio/gstreamer1-plugins-chromaprint/Makefile
index 316daec89e57..53fbc39e7aa9 100644
--- a/audio/gstreamer1-plugins-chromaprint/Makefile
+++ b/audio/gstreamer1-plugins-chromaprint/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer audio fingerprint extracting plugin
-GST_PLUGIN= chromaprint
-DIST= bad
+LIB_DEPENDS= libchromaprint.so:audio/chromaprint
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libchromaprint.so:audio/chromaprint
+DIST= bad
+GST_PLUGIN= chromaprint
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-faac/Makefile b/audio/gstreamer1-plugins-faac/Makefile
index eb7e715f48d2..45944030d57d 100644
--- a/audio/gstreamer1-plugins-faac/Makefile
+++ b/audio/gstreamer1-plugins-faac/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer MPEG-2 and MPEG-4 AAC encoder plugin
-GST_PLUGIN= faac
-DIST= bad
+LIB_DEPENDS= libfaac.so:audio/faac
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libfaac.so:audio/faac
+DIST= bad
+GST_PLUGIN= faac
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-faad/Makefile b/audio/gstreamer1-plugins-faad/Makefile
index d63c8e7b0960..da06599254ea 100644
--- a/audio/gstreamer1-plugins-faad/Makefile
+++ b/audio/gstreamer1-plugins-faad/Makefile
@@ -3,15 +3,15 @@ CATEGORIES= audio
COMMENT= GStreamer MPEG-2 and MPEG-4 AAC decoder plugin
-GST_PLUGIN= faad
-DIST= bad
+LIB_DEPENDS= libfaad.so:audio/faad
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MESON_ARGS+= -Dgpl=enabled
-PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-LIB_DEPENDS= libfaad.so:audio/faad
+PLIST= ${.CURDIR}/pkg-plist
-MESON_ARGS+= -Dgpl=enabled
+DIST= bad
+GST_PLUGIN= faad
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-flac/Makefile b/audio/gstreamer1-plugins-flac/Makefile
index 8f8c1f07601d..1ead6595fb28 100644
--- a/audio/gstreamer1-plugins-flac/Makefile
+++ b/audio/gstreamer1-plugins-flac/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer free lossless audio encoder/decoder plugin
-GST_PLUGIN= flac
-DIST= good
+LIB_DEPENDS= libFLAC.so:audio/flac
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libFLAC.so:audio/flac
+DIST= good
+GST_PLUGIN= flac
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-flite/Makefile b/audio/gstreamer1-plugins-flite/Makefile
index 7409b797f849..ac34dfaf2b1d 100644
--- a/audio/gstreamer1-plugins-flite/Makefile
+++ b/audio/gstreamer1-plugins-flite/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer flite run-time speech synthesis engine plugin
-GST_PLUGIN= flite
-DIST= bad
+LIB_DEPENDS= libflite.so:audio/flite
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libflite.so:audio/flite
+DIST= bad
+GST_PLUGIN= flite
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-gme/Makefile b/audio/gstreamer1-plugins-gme/Makefile
index 6ef26688859a..9d8c903d4c59 100644
--- a/audio/gstreamer1-plugins-gme/Makefile
+++ b/audio/gstreamer1-plugins-gme/Makefile
@@ -1,15 +1,15 @@
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= audio
COMMENT= GStreamer emulate gaming console sound processors plugin
-GST_PLUGIN= gme
-DIST= bad
+LIB_DEPENDS= libgme.so:audio/libgme
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libgme.so:audio/libgme
+DIST= bad
+GST_PLUGIN= gme
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-gsm/Makefile b/audio/gstreamer1-plugins-gsm/Makefile
index aaa8ec5976c0..ccfd5de6cc00 100644
--- a/audio/gstreamer1-plugins-gsm/Makefile
+++ b/audio/gstreamer1-plugins-gsm/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer gsm encoding/decoding plugin
-GST_PLUGIN= gsm
-DIST= bad
+LIB_DEPENDS= libgsm.so:audio/gsm
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libgsm.so:audio/gsm
+DIST= bad
+GST_PLUGIN= gsm
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-jack/Makefile b/audio/gstreamer1-plugins-jack/Makefile
index 1e07845be434..c636ed6989e3 100644
--- a/audio/gstreamer1-plugins-jack/Makefile
+++ b/audio/gstreamer1-plugins-jack/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer low-latency audio server plugin
-GST_PLUGIN= jack
-DIST= good
+LIB_DEPENDS= libjack.so:audio/jack
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libjack.so:audio/jack
+DIST= good
+GST_PLUGIN= jack
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-ladspa/Makefile b/audio/gstreamer1-plugins-ladspa/Makefile
index d189b8c62227..b9b1441a2aaf 100644
--- a/audio/gstreamer1-plugins-ladspa/Makefile
+++ b/audio/gstreamer1-plugins-ladspa/Makefile
@@ -3,15 +3,14 @@ CATEGORIES= audio
COMMENT= Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
-GST_PLUGIN= ladspa
-DIST= bad
-
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
+LIB_DEPENDS= liblrdf.so:textproc/liblrdf
-PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= liblrdf.so:textproc/liblrdf
+DIST= bad
+GST_PLUGIN= ladspa
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-lame/Makefile b/audio/gstreamer1-plugins-lame/Makefile
index fde330beb9bb..9901c21c0444 100644
--- a/audio/gstreamer1-plugins-lame/Makefile
+++ b/audio/gstreamer1-plugins-lame/Makefile
@@ -3,13 +3,13 @@ CATEGORIES= audio
COMMENT= GStreamer High-quality free mp3 encode plugin
-GST_PLUGIN= lame
-DIST= good
+LIB_DEPENDS= libmp3lame.so:audio/lame
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-LIB_DEPENDS= libmp3lame.so:audio/lame
+DIST= good
+GST_PLUGIN= lame
.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer1-plugins-lv2/Makefile b/audio/gstreamer1-plugins-lv2/Makefile
index d39b0eeff8a7..0b7bedf0526a 100644
--- a/audio/gstreamer1-plugins-lv2/Makefile
+++ b/audio/gstreamer1-plugins-lv2/Makefile
@@ -3,19 +3,17 @@ CATEGORIES= audio
COMMENT= Gstreamer lv2 wrapper plugin
-GST_PLUGIN= lv2
-DIST= bad
+BUILD_DEPENDS= lv2>=1.14.0:audio/lv2
+LIB_DEPENDS= liblilv-0.so:audio/lilv \
+ libserd-0.so:devel/serd \
+ libsord-0.so:devel/sord \
+ libsratom-0.so:audio/sratom
-MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+MASTERDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins
-PLIST= ${.CURDIR}/pkg-plist
+PLIST= ${.CURDIR}/pkg-plist
-BUILD_DEPENDS= lv2>=1.14.0:audio/lv2
-LIB_DEPENDS= libsord-0.so:devel/sord \
- libserd-0.so:devel/serd \
- libsratom-0.so:audio/sratom \
- liblilv-0.so:audio/lilv
+DIST= bad
+GST_PLUGIN= lv2
*** 4371 LINES SKIPPED ***