Attachment #236714 for bug #261585

Lines 8-11 DIST= ugly Link Here

(-)b/audio/gstreamer1-plugins-a52dec/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	MESON_ARGS+= -Dgpl=enabled
		12
		13	PLIST= ${.CURDIR}/pkg-plist
		14
		15	LIB_DEPENDS= liba52.so:audio/liba52
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-a52dec/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgsta52dec.so

Lines 6-11 COMMENT= GStreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin Link Here

(-)b/audio/gstreamer1-plugins-amrnb/Makefile (-1 / +7 lines)
6	GST_PLUGIN= amrnb	6	GST_PLUGIN= amrnb
7	DIST= ugly	7	DIST= ugly
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
		10
		11	MESON_ARGS+= -Dgpl=enabled
		12
		13	PLIST= ${.CURDIR}/pkg-plist
		14
		15	LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
10		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-amrnb/pkg-plist (+2 lines)
1	lib/gstreamer-%%VERSION%%/libgstamrnb.so
2	%%DATADIR%%-%%VERSION%%/presets/GstAmrnbEnc.prs

Lines 4-12 PKGNAMESUFFIX= 1-plugins-amrwbdec Link Here

(-)b/audio/gstreamer1-plugins-amrwbdec/Makefile (-2 / +8 lines)
4		4
5	COMMENT= GStreamer OpenCore based Adaptive Multi-Rate Wide-Band Decoder plugin	5	COMMENT= GStreamer OpenCore based Adaptive Multi-Rate Wide-Band Decoder plugin
6		6
7	GST_PLUGIN= amrwb	7	GST_PLUGIN= amrwbdec
8	DIST= ugly	8	DIST= ugly
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
		11
		12	MESON_ARGS+= -Dgpl=enabled
		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
11		17
12	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-amrwbdec/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstamrwbdec.so

Lines 6-11 COMMENT= GStreamer Bauer Stereophonic to Banaural BSP (bs2b) plugin Link Here

(-)b/audio/gstreamer1-plugins-bs2b/Makefile (-1 / +7 lines)
6	GST_PLUGIN= bs2b	6	GST_PLUGIN= bs2b
7	DIST= bad	7	DIST= bad
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12	LIB_DEPENDS= libbs2b.so:audio/libbs2b
		13
		14	MESON_ARGS+= -Dgpl=enabled
10		15
11	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"
		17

Added Link Here

(-)b/audio/gstreamer1-plugins-bs2b/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstbs2b.so

Lines 8-11 DIST= base Link Here

(-)b/audio/gstreamer1-plugins-cdparanoia/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-cdparanoia/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstcdparanoia.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-chromaprint/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libchromaprint.so:audio/chromaprint
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-chromaprint/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstchromaprint.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-faac/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libfaac.so:audio/faac
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-faac/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstfaac.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-faad/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libfaad.so:audio/faad
		14
		15	MESON_ARGS+= -Dgpl=enabled
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-faad/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstfaad.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-flac/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libFLAC.so:audio/flac
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-flac/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstflac.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-flite/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libflite.so:audio/flite
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-flite/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstflite.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-gme/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libgme.so:audio/libgme
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-gme/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstgme.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-gsm/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libgsm.so:audio/gsm
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-gsm/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstgsm.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-jack/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libjack.so:audio/jack
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-jack/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstjack.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-ladspa/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
		14
		15	LIB_DEPENDS= liblrdf.so:textproc/liblrdf
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-ladspa/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstladspa.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-lame/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libmp3lame.so:audio/lame
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-lame/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstlame.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-lv2/Makefile (+10 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	BUILD_DEPENDS= lv2>=1.14.0:audio/lv2
		14	LIB_DEPENDS= libsord-0.so:devel/sord \
		15	libserd-0.so:devel/serd \
		16	libsratom-0.so:audio/sratom \
		17	liblilv-0.so:audio/lilv
		18
11	.include "${MASTERDIR}/Makefile"	19	.include "${MASTERDIR}/Makefile"
		20
		21	USES+= pkgconfig

Added Link Here

(-)b/audio/gstreamer1-plugins-lv2/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstlv2.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-modplug/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libmodplug.so:audio/libmodplug
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-modplug/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmodplug.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-mpg123/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libmpg123.so:audio/mpg123
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-mpg123/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmpg123.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-musepack/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS=libmpcdec.so:audio/musepack
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-musepack/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmusepack.so

Lines 8-11 DIST= base Link Here

(-)b/audio/gstreamer1-plugins-ogg/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libogg.so:audio/libogg
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-ogg/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstogg.so




GST_PLUGIN=	openmpt
DIST=		bad

OPENMPT_GST_DIRS=	gst-libs/gst/audio

MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins

PLIST=  ${.CURDIR}/pkg-plist

LIB_DEPENDS=  libopenmpt.so:audio/libopenmpt
.endfor

.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-openmpt/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstopenmpt.so

Lines 8-11 DIST= base Link Here

(-)b/audio/gstreamer1-plugins-opus/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libopus.so:audio/opus
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-opus/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstopus.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-pulse/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libpulse.so:audio/pulseaudio
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-pulse/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstpulseaudio.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-shout2/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libshout.so:audio/libshout
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-shout2/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstshout2.so

Lines 8-11 DIST= ugly Link Here

(-)b/audio/gstreamer1-plugins-sidplay/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libsidplay.so:audio/libsidplay
		14
		15	MESON_ARGS+= -Dgpl=enabled
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-sidplay/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsid.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-sndfile/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libsndfile.so:audio/libsndfile
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-sndfile/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsndfile.so

Lines 8-11 DIST= bad Link Here

(-)b/audio/gstreamer1-plugins-soundtouch/Makefile (+3 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12	LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
		13
11	.include "${MASTERDIR}/Makefile"	14	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-soundtouch/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsoundtouch.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-speex/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libspeex.so:audio/speex
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-speex/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstspeex.so

Lines 11-14 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-taglib/Makefile (+4 lines)
11		11
12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
13		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	LIB_DEPENDS= libtag.so:audio/taglib
		17
14	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-taglib/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgsttaglib.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-twolame/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libtwolame.so:audio/twolame
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-twolame/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgsttwolame.so

Lines 8-11 DIST= base Link Here

(-)b/audio/gstreamer1-plugins-vorbis/Makefile (+5 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GSTREAMER= ogg
		14	LIB_DEPENDS= libvorbis.so:audio/libvorbis
		15
11	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-vorbis/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstvorbis.so

Lines 8-11 DIST= good Link Here

(-)b/audio/gstreamer1-plugins-wavpack/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libwavpack.so:audio/wavpack
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-wavpack/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstwavpack.so

Lines 10-13 USES+= compiler:c++11-lang Link Here

(-)b/audio/gstreamer1-plugins-webrtcdsp/Makefile (+4 lines)
10		10
11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
12		12
		13	PLIST= ${.CURDIR}/pkg-plist
		14
		15	LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
		16
13	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/audio/gstreamer1-plugins-webrtcdsp/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstwebrtcdsp.so

Lines 8-11 DIST= bad Link Here

(-)b/comms/gstreamer1-plugins-spandsp/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libspandsp.so:comms/spandsp
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/comms/gstreamer1-plugins-spandsp/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstspandsp.so

Lines 8-11 DIST= good Link Here

(-)b/devel/gstreamer1-plugins-soup/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/devel/gstreamer1-plugins-soup/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsoup.so

Lines 8-11 DIST= bad Link Here

(-)b/ftp/gstreamer1-plugins-curl/Makefile (+5 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libcurl.so:ftp/curl \
		14	libssh2.so:security/libssh2
		15
11	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/ftp/gstreamer1-plugins-curl/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstcurl.so

Lines 8-11 DIST= good Link Here

(-)b/graphics/gstreamer1-plugins-aalib/Makefile (+5 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libaa.so:graphics/aalib
		14	USES= ncurses
		15
11	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-aalib/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstaasink.so

Lines 8-11 DIST= good Link Here

(-)b/graphics/gstreamer1-plugins-cairo/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GNOME= cairo
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-cairo/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstcairo.so

Lines 4-12 PKGNAMESUFFIX= 1-plugins-gdkpixbuf Link Here

(-)b/graphics/gstreamer1-plugins-gdkpixbuf/Makefile (-1 / +5 lines)
4		4
5	COMMENT= GStreamer image decoder/overlay plugin	5	COMMENT= GStreamer image decoder/overlay plugin
6		6
7	GST_PLUGIN= gdk_pixbuf	7	GST_PLUGIN= gdk-pixbuf
8	DIST= good	8	DIST= good
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	USE_GNOME= gdkpixbuf2
		15
12	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-gdkpixbuf/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so




OPTIONS_DEFAULT=WAYLAND
OPTIONS_SUB=	yes

OPTIONS_UNSET=	WAYLAND

GL_WINSYS=	"x11,egl"

WAYLAND_VARS=	gl_winsys+=",wayland"
WAYLAND_BUILD_DEPENDS=		wayland-protocols>=0:graphics/wayland-protocols
WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland

USES=  gl
USE_GL=  gl glu glesv2 egl
USE_XORG+=x11 \
					xext \
					xcb
BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \
	libpng16.so:graphics/png

MESON_ARGS+= -Dgl=enabled \
						 -Dgl_winsys="${GL_WINSYS}" \
						 -Dgl_api=opengl,gles2 \
						 -Dgl_platform=glx,egl

GST_PLUGIN_DIR=  gst-libs/gst/gl ext/gl

.include "${MASTERDIR}/Makefile"




include/gstreamer-%%VERSION%%/gst/gl/egl/egl.h
include/gstreamer-%%VERSION%%/gst/gl/egl/gstegl.h
include/gstreamer-%%VERSION%%/gst/gl/egl/gsteglimage.h
include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl.h
include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl_device.h
include/gstreamer-%%VERSION%%/gst/gl/egl/gstglmemoryegl.h
include/gstreamer-%%VERSION%%/gst/gl/gl-enumtypes.h
include/gstreamer-%%VERSION%%/gst/gl/gl-prelude.h

include/gstreamer-%%VERSION%%/gst/gl/glprototypes/all_functions.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/base.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/blending.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/buffer_storage.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/buffers.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/debug.h
include/gstreamer-%%VERSION%%/gst/gl/glprototypes/eglimage.h

include/gstreamer-%%VERSION%%/gst/gl/gstglapi.h
include/gstreamer-%%VERSION%%/gst/gl/gstglbasefilter.h
include/gstreamer-%%VERSION%%/gst/gl/gstglbasememory.h
include/gstreamer-%%VERSION%%/gst/gl/gstglbasesrc.h
include/gstreamer-%%VERSION%%/gst/gl/gstglbuffer.h
include/gstreamer-%%VERSION%%/gst/gl/gstglbufferpool.h
include/gstreamer-%%VERSION%%/gst/gl/gstglcolorconvert.h
include/gstreamer-%%VERSION%%/gst/gl/gstglcontext.h
include/gstreamer-%%VERSION%%/gst/gl/gstglcontextconfig.h
include/gstreamer-%%VERSION%%/gst/gl/gstgldebug.h
include/gstreamer-%%VERSION%%/gst/gl/gstgldisplay.h
include/gstreamer-%%VERSION%%/gst/gl/gstglfeature.h

include/gstreamer-%%VERSION%%/gst/gl/gstglviewconvert.h
include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h
%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h
%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/wayland.h
include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h
include/gstreamer-%%VERSION%%/gst/gl/x11/x11.h
lib/girepository-%%VERSION%%/GstGL-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstGLEGL-%%VERSION%%.typelib
%%WAYLAND%%lib/girepository-%%VERSION%%/GstGLWayland-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstGLX11-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/include/gst/gl/gstglconfig.h
lib/gstreamer-%%VERSION%%/libgstopengl.so
lib/libgstgl-%%VERSION%%.so
lib/libgstgl-%%VERSION%%.so.0
lib/libgstgl-%%VERSION%%.so.%%SOVERSION%%
libdata/pkgconfig/gstreamer-gl-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-gl-egl-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-gl-prototypes-%%VERSION%%.pc
%%WAYLAND%%libdata/pkgconfig/gstreamer-gl-wayland-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-gl-x11-%%VERSION%%.pc
share/gir-%%VERSION%%/GstGL-%%VERSION%%.gir
share/gir-%%VERSION%%/GstGLEGL-%%VERSION%%.gir
%%WAYLAND%%share/gir-%%VERSION%%/GstGLWayland-%%VERSION%%.gir
share/gir-%%VERSION%%/GstGLX11-%%VERSION%%.gir

Lines 8-11 DIST= good Link Here

(-)b/graphics/gstreamer1-plugins-jpeg/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USES= jpeg
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-jpeg/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstjpeg.so

Lines 8-11 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-kms/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libdrm.so:graphics/libdrm
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-kms/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstkms.so

Lines 8-11 DIST= good Link Here

(-)b/graphics/gstreamer1-plugins-libcaca/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libcaca.so:graphics/libcaca
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-libcaca/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstcacasink.so

Lines 8-11 DIST= base Link Here

(-)b/graphics/gstreamer1-plugins-libvisual/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libvisual-0.4.so:graphics/libvisual04
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-libvisual/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstlibvisual.so

Lines 10-15 MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins Link Here

(-)b/graphics/gstreamer1-plugins-opencv/Makefile (+2 lines)
10		10
11	# Clang has issues with Overloaded stuff inside OpenCV	11	# Clang has issues with Overloaded stuff inside OpenCV
12	CXXFLAGS+= -Wno-overloaded-virtual	12	CXXFLAGS+= -Wno-overloaded-virtual
		13	LIB_DEPENDS= libopencv_highgui.so:graphics/opencv
		14	GST_PLUGIN_DIR= gst-libs/gst/opencv ext/opencv
13		15
14	PLIST= ${.CURDIR}/pkg-plist	16	PLIST= ${.CURDIR}/pkg-plist
15		17

Lines 5-9 lib/gstreamer-%%VERSION%%/libgstopencv.so Link Here

(-)b/graphics/gstreamer1-plugins-opencv/pkg-plist (-2 lines)
5	lib/libgstopencv-%%VERSION%%.so	5	lib/libgstopencv-%%VERSION%%.so
6	lib/libgstopencv-%%VERSION%%.so.0	6	lib/libgstopencv-%%VERSION%%.so.0
7	lib/libgstopencv-%%VERSION%%.so.%%SOVERSION%%	7	lib/libgstopencv-%%VERSION%%.so.%%SOVERSION%%
8	share/gst-plugins-bad/%%VERSION%%/opencv_haarcascades/fist.xml
9	share/gst-plugins-bad/%%VERSION%%/opencv_haarcascades/palm.xml

Lines 9-17 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-openexr/Makefile (-3 / +5 lines)
9		9
10	CPPFLAGS+= -DInt64=uint64_t	10	CPPFLAGS+= -DInt64=uint64_t
11		11
12	pre-configure:
13	${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/ext/openexr/Makefile.in
14
15	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
16		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	LIB_DEPENDS= libOpenEXR.so:graphics/openexr \
		17	libImath-3_1.so:math/Imath
		18
17	.include "${MASTERDIR}/Makefile"	19	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-openexr/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstopenexr.so

Lines 8-13 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-openjpeg/Makefile (-1 / +3 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
11	EXTRA_PATCHES= ${.CURDIR}/files/patch-inc	11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
12		14
13	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"




Put the openjpeg include directory first, so that <openjpeg.h> includes
$LOCALBASE/include/openjpeg-2.3/openjpeg.h instead of $LOCALBASE/include/openjpeg.h

--- ext/openjpeg/Makefile.in.orig	2018-09-16 22:05:02.688860000 +0300
+++ ext/openjpeg/Makefile.in	2018-09-16 22:05:11.316104000 +0300
@@ -861,21 +861,21 @@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

 libgstopenjpeg_la-gstopenjpegdec.lo: gstopenjpegdec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstopenjpegdec.c' object='libgstopenjpeg_la-gstopenjpegdec.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' || echo '$(srcdir)/'`gstopenjpegdec.c

 libgstopenjpeg_la-gstopenjpegenc.lo: gstopenjpegenc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstopenjpegenc.c' object='libgstopenjpeg_la-gstopenjpegenc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' || echo '$(srcdir)/'`gstopenjpegenc.c

 libgstopenjpeg_la-gstopenjpeg.lo: gstopenjpeg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' || echo '$(srcdir)/'`gstopenjpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' || echo '$(srcdir)/'`gstopenjpeg.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gstopenjpeg.c' object='libgstopenjpeg_la-gstopenjpeg.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

Added Link Here

(-)b/graphics/gstreamer1-plugins-openjpeg/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstopenjpeg.so

Lines 4-12 PKGNAMESUFFIX= 1-plugins-png Link Here

(-)b/graphics/gstreamer1-plugins-png/Makefile (-1 / +5 lines)
4		4
5	COMMENT= GStreamer png plugin	5	COMMENT= GStreamer png plugin
6		6
7	GST_PLUGIN= libpng	7	GST_PLUGIN= png
8	DIST= good	8	DIST= good
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	LIB_DEPENDS= libpng.so:graphics/png
		15
12	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-png/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstpng.so

Lines 3-11 CATEGORIES= graphics Link Here

(-)b/graphics/gstreamer1-plugins-qt/Makefile (-1 / +8 lines)
3		3
4	COMMENT= GStreamer Qt videosink plugin	4	COMMENT= GStreamer Qt videosink plugin
5		5
6	GST_PLUGIN= qt	6	GST_PLUGIN_SUFFIX= -qt
		7	GST_PLUGIN= qt5
7	DIST= good	8	DIST= good
8		9
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	USES= compiler:c++11-lang qt:5
		15	USE_QT= core gui declarative buildtools_build network x11extras
		16	USE_GSTREAMER= gl
		17
11	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-qt/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstqmlgl.so

Lines 8-11 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-rsvg/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GNOME= cairo librsvg2
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-rsvg/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstrsvg.so

Lines 8-11 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-vulkan/Makefile (+16 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GSTREAMER= gl
		14	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
		15	${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \
		16	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
		17	wayland-protocols>=0:graphics/wayland-protocols
		18	LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
		19	libwayland-client.so:graphics/wayland \
		20	libshaderc_shared.so:graphics/shaderc
		21
		22	MESON_ARGS+= -Dwayland=enabled
		23
11	.include "${MASTERDIR}/Makefile"	24	.include "${MASTERDIR}/Makefile"
		25
		26	SHEBANG_FILES+= ext/vulkan/shaders/bin2array.py
		27




include/gstreamer-%%VERSION%%/gst/vulkan/gstvkapi.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbarrier.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbuffermemory.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbufferpool.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandbuffer.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandpool.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkconfig.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdebug.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorcache.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorpool.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorset.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdevice.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdisplay.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkerror.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkfence.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkformat.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkfullscreenquad.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkhandle.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkhandlepool.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimagebufferpool.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimagememory.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimageview.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkinstance.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkmemory.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkphysicaldevice.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkqueue.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkswapper.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvktrash.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkutils.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkvideofilter.h
include/gstreamer-%%VERSION%%/gst/vulkan/gstvkwindow.h
include/gstreamer-%%VERSION%%/gst/vulkan/vulkan-enumtypes.h
include/gstreamer-%%VERSION%%/gst/vulkan/vulkan-prelude.h
include/gstreamer-%%VERSION%%/gst/vulkan/vulkan.h
include/gstreamer-%%VERSION%%/gst/vulkan/vulkan_fwd.h
include/gstreamer-%%VERSION%%/gst/vulkan/wayland/gstvkdisplay_wayland.h
include/gstreamer-%%VERSION%%/gst/vulkan/wayland/wayland.h
include/gstreamer-%%VERSION%%/gst/wayland/wayland.h
lib/girepository-%%VERSION%%/GstVulkan-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstVulkanWayland-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstvulkan.so
lib/gstreamer-%%VERSION%%/libgstwaylandsink.so
lib/libgstvulkan-%%VERSION%%.so
lib/libgstvulkan-%%VERSION%%.so.0
lib/libgstvulkan-%%VERSION%%.so.%%SOVERSION%%
lib/libgstwayland-%%VERSION%%.so
lib/libgstwayland-%%VERSION%%.so.0
lib/libgstwayland-%%VERSION%%.so.%%SOVERSION%%
libdata/pkgconfig/gstreamer-vulkan-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-vulkan-wayland-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-wayland-%%VERSION%%.pc
share/gir-%%VERSION%%/GstVulkan-%%VERSION%%.gir
share/gir-%%VERSION%%/GstVulkanWayland-%%VERSION%%.gir

Lines 8-11 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-webp/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libwebp.so:graphics/webp
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-webp/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstwebp.so

Lines 8-11 DIST= bad Link Here

(-)b/graphics/gstreamer1-plugins-zbar/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libzbar.so:graphics/zbar
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/graphics/gstreamer1-plugins-zbar/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstzbar.so




PORTNAME=	gstreamer1-editing-services
PORTVERSION=	1.20.3
CATEGORIES=	multimedia
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer-editing-services/
DISTNAME=	gst-editing-services-${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	GStreamer editing services

LICENSE=	LGPL20

USES=		bison compiler:c11 gnome gstreamer meson ninja python:3.8+,build pkgconfig shebangfix tar:xz
USE_LDCONFIG=	yes
USE_GNOME=	glib20 introspection:build libxml2 pygobject3:build
USE_GSTREAMER=	good bad
LIB_DEPENDS+=	libgstvalidate-1.0.so:multimedia/gstreamer1-validate \
							libpython3.9.so:lang/python39
PORTSCOUT=	limitw:1,even

CONFIGURE_ARGS=	-Ddoc=disabled \
		-Dintrospection=enabled \
		-Dpygi-overrides-dir=${PYTHON_SITELIBDIR}/gstreamer-editing-services
PLIST_SUB=	VERSION=1.0 SOVERSION=0.2003.0

SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

post-install:
	${MKDIR} ${PREFIX}/share/bash-completion/completions
	${INSTALL_SCRIPT} ${WRKSRC}/data/completions/ges-launch-1.0 \
	${STAGEDIR}${PREFIX}/share/bash-completion/completions/

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1-editing-services/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1654955116	1	TIMESTAMP = 1661966172
2	SHA256 (gstreamer-editing-services-1.16.3.tar.xz) = 9b05cbb8a6f1db53999e7ad11f00f4f1ccc154d6805b7e49cb7755eb37a99ba6	2	SHA256 (gst-editing-services-1.20.3.tar.xz) = 5fd896de69fbe24421eb6b0ff8d2f8b4c3cba3f3025ceacd302172f39a8abaa2
3	SIZE (gstreamer-editing-services-1.16.3.tar.xz) = 1091208	3	SIZE (gst-editing-services-1.20.3.tar.xz) = 979284




include/gstreamer-%%VERSION%%/ges/ges-group.h
include/gstreamer-%%VERSION%%/ges/ges-image-source.h
include/gstreamer-%%VERSION%%/ges/ges-layer.h
include/gstreamer-%%VERSION%%/ges/ges-marker-list.h
include/gstreamer-%%VERSION%%/ges/ges-meta-container.h
include/gstreamer-%%VERSION%%/ges/ges-multi-file-source.h
include/gstreamer-%%VERSION%%/ges/ges-operation-clip.h

include/gstreamer-%%VERSION%%/ges/ges-project.h
include/gstreamer-%%VERSION%%/ges/ges-screenshot.h
include/gstreamer-%%VERSION%%/ges/ges-source-clip.h
include/gstreamer-%%VERSION%%/ges/ges-source-clip-asset.h
include/gstreamer-%%VERSION%%/ges/ges-source.h
include/gstreamer-%%VERSION%%/ges/ges-test-clip.h
include/gstreamer-%%VERSION%%/ges/ges-text-overlay-clip.h
include/gstreamer-%%VERSION%%/ges/ges-text-overlay.h
include/gstreamer-%%VERSION%%/ges/ges-time-overlay-clip.h
include/gstreamer-%%VERSION%%/ges/ges-timeline-element.h
include/gstreamer-%%VERSION%%/ges/ges-timeline.h
include/gstreamer-%%VERSION%%/ges/ges-title-clip.h
include/gstreamer-%%VERSION%%/ges/ges-title-source.h
include/gstreamer-%%VERSION%%/ges/ges-track-element-asset.h
include/gstreamer-%%VERSION%%/ges/ges-track-element-deprecated.h
include/gstreamer-%%VERSION%%/ges/ges-track-element.h
include/gstreamer-%%VERSION%%/ges/ges-track.h
include/gstreamer-%%VERSION%%/ges/ges-transition-clip.h




PORTNAME=	gstreamer1-libav
PORTVERSION=	1.20.3
CATEGORIES=	multimedia
MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-libav/
DISTNAME=	gst-libav-${PORTVERSION}

PATCH_SITES=	https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/
PATCHFILES+=	07b43c727c9a.patch:-p1 # https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/127

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	GStreamer plug-in with many audio/video decoders/encoders

LICENSE=	LGPL20+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	orc>=0.4.16:devel/orc
LIB_DEPENDS=	liborc-0.4.so:devel/orc

PORTSCOUT=	limitw:1,even

USES=		bison gettext-runtime gnome gstreamer libtool localbase \
				meson ninja pkgconfig python:3.8+,build shebangfix tar:xz
USE_LDCONFIG=	yes
USE_GNOME=	glib20
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip

SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}
OPTIONS_DEFINE=	FFMPEG
OPTIONS_DEFAULT=FFMPEG

FFMPEG_DESC?=	Use system ffmpeg instead of internal libav
FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_WITH=	system-libav
FFMPEG_BUILD_DEPENDS_OFF=	nasm:devel/nasm
FFMPEG_MAKE_ENV_OFF=	V=1
FFMPEG_VARS_OFF+=	NOPRECIOUSMAKEVARS=yes # ARCH

LDFLAGS_aarch64=	-Wl,-z,notext
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|-Werror||g' \
		${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)b/multimedia/gstreamer1-libav/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1575825716	1	TIMESTAMP = 1663682373
2	SHA256 (gst-libav-1.16.2.tar.xz) = c724f612700c15a933c7356fbeabb0bb9571fb5538f8b1b54d4d2d94188deef2	2	SHA256 (gst-libav-1.20.3.tar.xz) = 3fedd10560fcdfaa1b6462cbf79a38c4e7b57d7f390359393fc0cef6dbf27dfe
3	SIZE (gst-libav-1.16.2.tar.xz) = 9466288	3	SIZE (gst-libav-1.20.3.tar.xz) = 284528
4	SHA256 (07b43c727c9a.patch) = a0331d46d744dba3885a3834457ed071111b49eccfda70ebada914090831f12b
5	SIZE (07b43c727c9a.patch) = 1237




lib/gstreamer-1.0/libgstlibav.so
share/gtk-doc/html/gst-libav-plugins-1.0/ch01.html
share/gtk-doc/html/gst-libav-plugins-1.0/ch02.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-1.0.devhelp2
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudDec.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudEnc.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidDec.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidEnc.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstav.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcfg.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcodecmap.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavprotocol.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavutils.html
share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-plugin-libav.html
share/gtk-doc/html/gst-libav-plugins-1.0/home.png
share/gtk-doc/html/gst-libav-plugins-1.0/index.html
share/gtk-doc/html/gst-libav-plugins-1.0/left-insensitive.png
share/gtk-doc/html/gst-libav-plugins-1.0/left.png
share/gtk-doc/html/gst-libav-plugins-1.0/right-insensitive.png
share/gtk-doc/html/gst-libav-plugins-1.0/right.png
share/gtk-doc/html/gst-libav-plugins-1.0/style.css
share/gtk-doc/html/gst-libav-plugins-1.0/up-insensitive.png
share/gtk-doc/html/gst-libav-plugins-1.0/up.png

Lines 1-6 Link Here

(-)b/multimedia/gstreamer1-plugins-all/Makefile (-2 / +2 lines)
1	PORTNAME= gstreamer1-plugins-all	1	PORTNAME= gstreamer1-plugins-all
2	PORTVERSION= 1.16	2	PORTVERSION= 1.20
3	PORTREVISION= 4	3	PORTREVISION= 3
4	CATEGORIES= multimedia	4	CATEGORIES= multimedia
5		5
6	MAINTAINER= multimedia@FreeBSD.org	6	MAINTAINER= multimedia@FreeBSD.org

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-aom/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libaom.so:multimedia/aom
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-aom/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstaom.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-assrender/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libass.so:multimedia/libass
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	USES+= compiler:c11

Added Link Here

(-)b/multimedia/gstreamer1-plugins-assrender/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstassrender.so




PORTREVISION=	2
CATEGORIES=	multimedia

COMMENT=	GStreamer-plugins that need more quality, testing or documentation

GST_PLUGIN=	bad
GST_PLUGIN_SUFFIX=	-bad

USES+=	xorg
USE_XORG+=x11

MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins

DIST=		bad
BAD_GST_ENABLED_PLUGINS= accurip \
										 adaptivedemux \
										 adpcmdec \
										 adpcmenc \
										 aes \
										 aiff \
										 asfmux \
										 audio \
										 audiobuffersplit \
										 audiofxbad \
										 audiolatency \
										 audiomixmatrix \
										 audiovisualizers \
										 autoconvert \
										 basecamerabinsrc \
										 bayer \
										 bz2 \
										 camerabin2 \
										 codecalpha \
										 codecparsers \
										 codecs \
										 coloreffects \
										 data \
										 debugutils \
										 dvbsubenc \
										 dvbsuboverlay \
										 dvdspu \
										 examples \
										 faceoverlay \
										 festival \
										 fieldanalysis \
										 freeverb \
										 frei0r \
										 gaudieffects \
										 gdp \
										 geometrictransform \
										 id3tag \
										 insertbin \
										 inter \
										 interfaces \
										 interlace \
										 ipcpipeline \
										 isoff \
										 ivfparse \
										 ivtc \
										 jp2kdecimator \
										 jpegformat \
										 librfb \
										 midi \
										 mpegdemux \
										 mpegpsmux \
										 mpegts \
										 mpegtsdemux \
										 mpegtsmux \
										 mxf \
										 netsim \
										 nls \
										 onvif \
										 pcapparse \
										 pkgconfig \
										 play \
										 player \
										 pnm \
										 proxy \
										 rawparse \
										 removesilence \
										 rist \
										 rtmp2 \
										 rtp \
										 sctp \
										 sdp \
										 segmentclip \
										 shm \
										 siren \
										 smooth \
										 speed \
										 subenc \
										 switchbin \
										 timecode \
										 transcode \
										 transcoder \
										 uridownloader \
										 videofilters \
										 videoframe_audiolevel \
										 videoparsers \
										 videosignal \
										 vmnc \
										 webrtc \
										 y4m

NO_GSTREAMER_COMMON=	yes
PLIST=		${.CURDIR}/pkg-plist

USES+=ssl
.for dir in ${BAD_GST_DIRS}
	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
.endfor

do-install:
.for dir in ${BAD_GST_DIRS}
	@(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
.endfor

.include "${MASTERDIR}/Makefile"

USE_GNOME+=	glib20 gtk30

BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:multimedia/v4l_compat \
	gtk3>=3.10:x11-toolkits/gtk30

LIB_DEPENDS+=libnice.so:net-im/libnice





--- data/meson.build.orig	2022-09-05 21:41:46 UTC
+++ data/meson.build
@@ -1,3 +1,4 @@
+if get_option('data').enabled()
 encoding_targetsdir = join_paths(get_option('datadir'),
     'gstreamer-' + api_version, 'encoding-profiles')
 
@@ -21,3 +22,4 @@ foreach path_targets : encoding_targets
   etargets = path_targets.get(1)
   install_data(sources: etargets, install_dir: dir)
 endforeach
+endif




--- ext/dash/meson.build.orig	2022-09-13 21:07:32 UTC
+++ ext/dash/meson.build
@@ -45,9 +45,15 @@ if xml2_dep.found()
     c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
     link_args : noseh_link_args,
     include_directories : [configinc, libsinc],
-    dependencies : [gstadaptivedemux_dep, gsturidownloader_dep, gsttag_dep,
-                    gstnet_dep, gstpbutils_dep, gstbase_dep, gstisoff_dep,
-                    gio_dep, xml2_dep],
+    dependencies : [cc.find_library('gstadaptivedemux-1.0', required : true),
+      cc.find_library('gsturidownloader-1.0', required : true),
+      dependency('gstreamer-tag-1.0'),
+      dependency('gstreamer-net-1.0'),
+      dependency('gstreamer-pbutils-1.0'),
+      gstbase_dep,
+      cc.find_library('gstisoff-1.0', required : true),
+      gio_dep,
+      xml2_dep],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/hls/meson.build.orig	2022-09-16 17:38:38 UTC
+++ ext/hls/meson.build
@@ -58,7 +58,8 @@ gsthls = library('gsthls',
   link_args : noseh_link_args,
   include_directories : [configinc],
   dependencies : [gstpbutils_dep, gsttag_dep, gstvideo_dep,
-                  gstadaptivedemux_dep, gsturidownloader_dep,
+                  cc.find_library('gstadaptivedemux-1.0', required: true),
+                  cc.find_library('gsturidownloader-1.0', required: true),
                   hls_crypto_dep, gio_dep, libm],
   install : true,
   install_dir : plugins_install_dir,

Removed Link Here

(-)a/multimedia/gstreamer1-plugins-bad/files/patch-ext_opencv_gstcvdilateerode.cpp (-11 lines)
1	--- ext/opencv/gstcvdilateerode.cpp.orig 2021-08-02 14:37:33 UTC
2	+++ ext/opencv/gstcvdilateerode.cpp
3	@@ -89,7 +89,7 @@ gst_cv_dilate_erode_get_type (void)
4	{
5	static volatile gsize opencv_dilate_erode_type = 0;
6
7	- if (g_once_init_enter (&opencv_dilate_erode_type)) {
8	+ if (g_once_init_enter ((unsigned long *)&opencv_dilate_erode_type)) {
9	GType _type;
10	static const GTypeInfo opencv_dilate_erode_info = {
11	sizeof (GstCvDilateErodeClass),

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openjpeg_meson.build (+11 lines)
1	--- ext/openjpeg/meson.build.orig 2022-09-12 08:53:57 UTC
2	+++ ext/openjpeg/meson.build
3	@@ -18,7 +18,7 @@ if openjpeg_dep.found()
4	link_args : noseh_link_args,
5	include_directories : [configinc],
6	dependencies : [gst_dep, gstvideo_dep, openjpeg_dep,
7	- gstcodecparsers_dep, libm],
8	+ dependency('gstreamer-codecparsers-1.0'), libm],
9	install : true,
10	install_dir : plugins_install_dir,
11	)

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_openmpt_meson.build (+11 lines)
1	--- ext/openmpt/meson.build.orig 2022-06-15 22:36:22 UTC
2	+++ ext/openmpt/meson.build
3	@@ -4,7 +4,7 @@ if openmpt_dep.found()
4	'gstopenmptdec.c', 'plugin.c',
5	c_args: gst_plugins_bad_args,
6	include_directories: [configinc],
7	- dependencies: [gstbadaudio_dep, gstaudio_dep, openmpt_dep],
8	+ dependencies: [dependency('gstreamer-bad-audio-1.0'), dependency('gstreamer-audio-1.0'), openmpt_dep],
9	install: true,
10	install_dir: plugins_install_dir,
11	)




--- ext/smoothstreaming/meson.build.orig	2022-09-16 20:01:19 UTC
+++ ext/smoothstreaming/meson.build
@@ -13,8 +13,12 @@ if xml28_dep.found()
     c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
     link_args : noseh_link_args,
     include_directories : [configinc, libsinc],
-    dependencies : [gst_dep, gstadaptivedemux_dep, gstcodecparsers_dep,
-		    gsturidownloader_dep, gstisoff_dep, xml28_dep, gio_dep],
+    dependencies : [gst_dep,
+      cc.find_library('gstadaptivedemux-1.0', required : true),
+      dependency('gstreamer-codecparsers-1.0', required : true),
+      cc.find_library('gsturidownloader-1.0', required : true),
+      cc.find_library('gstisoff-1.0', required : true),
+      xml28_dep, gio_dep],
     install : true,
     install_dir : plugins_install_dir,
   )

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_spandsp_gstspanplc.h (+10 lines)
1	--- ext/spandsp/gstspanplc.h.orig 2022-09-16 22:58:32 UTC
2	+++ ext/spandsp/gstspanplc.h
3	@@ -22,6 +22,7 @@
4
5	#include <gst/gst.h>
6
7	+#include <spandsp/private/plc.h>
8	#include <spandsp.h>
9
10	G_BEGIN_DECLS

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_webrtcdsp_meson.build (+11 lines)
1	--- ext/webrtcdsp/meson.build.orig 2022-09-07 19:55:24 UTC
2	+++ ext/webrtcdsp/meson.build
3	@@ -17,7 +17,7 @@ if webrtc_dep.found() and gnustl_dep.found()
4	cpp_args : gst_plugins_bad_args,
5	link_args : noseh_link_args,
6	include_directories : [configinc],
7	- dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep],
8	+ dependencies : [gstbase_dep, gstaudio_dep, dependency('gstreamer-bad-audio-1.0'), webrtc_dep, gnustl_dep],
9	install : true,
10	install_dir : plugins_install_dir,
11	override_options : ['cpp_std=c++11'],




From a0cd455dd0e0375c6395fe732173225ea7e18562 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@gnu.org>
Date: Fri, 20 Mar 2020 15:49:06 +0100
Subject: [PATCH] lv2: Make it build with -fno-common

GCC 10 defaults to -fno-common. This means that global variables shared
across multiple translation units should be declared as 'extern' in
header files and defined in exactly one C file. See:
https://gcc.gnu.org/gcc-10/porting_to.html

https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125>
---
 ext/lv2/gstlv2.c | 33 ++++++++++++++++++++++++++
 ext/lv2/gstlv2.h | 62 ++++++++++++++++++++++++------------------------
 2 files changed, 64 insertions(+), 31 deletions(-)

diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
index 60d502f41a..7feeee1921 100644
--- ext/lv2/gstlv2.c
+++ ext/lv2/gstlv2.c
@@ -69,6 +69,39 @@ GST_DEBUG_CATEGORY (lv2_debug);
 #error "Unsupported OS"
 #endif
 
+LilvWorld *world = NULL;
+LilvNode *atom_class = NULL;
+LilvNode *audio_class = NULL;
+LilvNode *control_class = NULL;
+LilvNode *cv_class = NULL;
+LilvNode *event_class = NULL;
+LilvNode *input_class = NULL;
+LilvNode *output_class = NULL;
+LilvNode *preset_class = NULL;
+LilvNode *state_iface = NULL;
+LilvNode *state_uri = NULL;
+
+LilvNode *integer_prop = NULL;
+LilvNode *toggled_prop = NULL;
+LilvNode *designation_pred = NULL;
+LilvNode *in_place_broken_pred = NULL;
+LilvNode *optional_pred = NULL;
+LilvNode *group_pred = NULL;
+LilvNode *supports_event_pred = NULL;
+LilvNode *label_pred = NULL;
+
+LilvNode *center_role = NULL;
+LilvNode *left_role = NULL;
+LilvNode *right_role = NULL;
+LilvNode *rear_center_role = NULL;
+LilvNode *rear_left_role = NULL;
+LilvNode *rear_right_role = NULL;
+LilvNode *lfe_role = NULL;
+LilvNode *center_left_role = NULL;
+LilvNode *center_right_role = NULL;
+LilvNode *side_left_role = NULL;
+LilvNode *side_right_role = NULL;
+
 GstStructure *lv2_meta_all = NULL;
 
 static void
diff --git a/ext/lv2/gstlv2.h b/ext/lv2/gstlv2.h
index 177f9b2c19..9f72582294 100644
--- ext/lv2/gstlv2.h
+++ ext/lv2/gstlv2.h
@@ -28,40 +28,40 @@
 
 #include "gstlv2utils.h"
 
-LilvWorld *world;
-LilvNode *atom_class;
-LilvNode *audio_class;
-LilvNode *control_class;
-LilvNode *cv_class;
-LilvNode *event_class;
-LilvNode *input_class;
-LilvNode *output_class;
-LilvNode *preset_class;
-LilvNode *state_iface;
-LilvNode *state_uri;
+extern LilvWorld *world;
+extern LilvNode *atom_class;
+extern LilvNode *audio_class;
+extern LilvNode *control_class;
+extern LilvNode *cv_class;
+extern LilvNode *event_class;
+extern LilvNode *input_class;
+extern LilvNode *output_class;
+extern LilvNode *preset_class;
+extern LilvNode *state_iface;
+extern LilvNode *state_uri;
 
-LilvNode *integer_prop;
-LilvNode *toggled_prop;
-LilvNode *designation_pred;
-LilvNode *in_place_broken_pred;
-LilvNode *optional_pred;
-LilvNode *group_pred;
-LilvNode *supports_event_pred;
-LilvNode *label_pred;
+extern LilvNode *integer_prop;
+extern LilvNode *toggled_prop;
+extern LilvNode *designation_pred;
+extern LilvNode *in_place_broken_pred;
+extern LilvNode *optional_pred;
+extern LilvNode *group_pred;
+extern LilvNode *supports_event_pred;
+extern LilvNode *label_pred;
 
-LilvNode *center_role;
-LilvNode *left_role;
-LilvNode *right_role;
-LilvNode *rear_center_role;
-LilvNode *rear_left_role;
-LilvNode *rear_right_role;
-LilvNode *lfe_role;
-LilvNode *center_left_role;
-LilvNode *center_right_role;
-LilvNode *side_left_role;
-LilvNode *side_right_role;
+extern LilvNode *center_role;
+extern LilvNode *left_role;
+extern LilvNode *right_role;
+extern LilvNode *rear_center_role;
+extern LilvNode *rear_left_role;
+extern LilvNode *rear_right_role;
+extern LilvNode *lfe_role;
+extern LilvNode *center_left_role;
+extern LilvNode *center_right_role;
+extern LilvNode *side_left_role;
+extern LilvNode *side_right_role;
 
-GstStructure *lv2_meta_all;
+extern GstStructure *lv2_meta_all;
 
 void gst_lv2_filter_register_element (GstPlugin *plugin,
                                       GstStructure * lv2_meta);
-- 
GitLab






https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1255

vkerror.c:66:16: error: use of undeclared identifier 'VK_RESULT_BEGIN_RANGE'
  if (result < VK_RESULT_BEGIN_RANGE)
               ^

--- ext/vulkan/vkerror.c.orig	2019-04-19 09:16:36 UTC
+++ ext/vulkan/vkerror.c
@@ -27,7 +27,7 @@
 #include "vkerror.h"
 
 /* *INDENT-OFF* */
-static const struct 
+static const struct
 {
   VkResult result;
   const char *str;
@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
 
   if (result >= 0)
     return NULL;
-  if (result < VK_RESULT_BEGIN_RANGE)
-    return "Unknown Error";
 
   for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
     if (result == vk_result_string_map[i].result)




--- gst-libs/gst/adaptivedemux/meson.build.orig	2022-09-05 19:47:37 UTC
+++ gst-libs/gst/adaptivedemux/meson.build
@@ -1,5 +1,8 @@
+if get_option('adaptivedemux').enabled()
 adaptivedemux_sources = files('gstadaptivedemux.c')
-adaptivedemux_headers = files('gstadaptivedemux.h')
+adaptivedemux_headers = files('gstadaptivedemux.h',
+  'adaptive-demux-prelude.h')
+install_headers(adaptivedemux_headers, subdir : 'gstreamer-1.0/gst/adaptivedemux')
 
 pkg_name = 'gstreamer-adaptivedemux-1.0'
 gstadaptivedemux = library('gstadaptivedemux-' + api_version,
@@ -18,4 +21,5 @@ gstadaptivedemux_dep = declare_dependency(link_with : 
   include_directories : [libsinc],
   dependencies : [gstbase_dep, gsturidownloader_dep])
 
-meson.override_dependency(pkg_name, gstadaptivedemux_dep)
\ No newline at end of file
+meson.override_dependency(pkg_name, gstadaptivedemux_dep)
+endif




--- gst-libs/gst/audio/meson.build.orig	2022-09-05 20:33:42 UTC
+++ gst-libs/gst/audio/meson.build
@@ -1,3 +1,4 @@
+if get_option('audio').enabled()
 badaudio_sources = files('gstnonstreamaudiodecoder.c', 'gstplanaraudioadapter.c')
 badaudio_headers = files('gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h', 'gstplanaraudioadapter.h')
 install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio')
@@ -52,3 +53,4 @@ gstbadaudio_dep = declare_dependency(link_with : gstba
   dependencies : [gstaudio_dep, gstbase_dep])
 
 meson.override_dependency(pkg_name, gstbadaudio_dep)
+endif




--- gst-libs/gst/basecamerabinsrc/meson.build.orig	2022-09-05 21:00:40 UTC
+++ gst-libs/gst/basecamerabinsrc/meson.build
@@ -1,3 +1,4 @@
+if get_option('basecamerabinsrc').enabled()
 camerabin_sources = files(
   'gstcamerabin-enum.c',
   'gstcamerabinpreview.c',
@@ -51,3 +52,4 @@ gstbasecamerabin_dep = declare_dependency(link_with : 
   sources: gen_sources,
   dependencies : [gstapp_dep])
 meson.override_dependency(pkg_name, gstbasecamerabin_dep)
+endif




--- gst-libs/gst/codecparsers/meson.build.orig	2022-09-05 20:42:22 UTC
+++ gst-libs/gst/codecparsers/meson.build
@@ -1,3 +1,4 @@
+if get_option('codecparsers').enabled()
 codecparser_sources = files([
   'gstjpeg2000sampling.c',
   'gstjpegparser.c',
@@ -69,3 +70,4 @@ gstcodecparsers_dep = declare_dependency(link_with : g
 
 libraries += [[pkg_name, {'lib': gstcodecparsers}]]
 meson.override_dependency(pkg_name, gstcodecparsers_dep)
+endif




--- gst-libs/gst/codecs/meson.build.orig	2022-09-05 20:49:44 UTC
+++ gst-libs/gst/codecs/meson.build
@@ -1,3 +1,4 @@
+if get_option('codecs').enabled()
 codecs_sources = files(
   'gsth264decoder.c',
   'gsth264picture.c',
@@ -81,4 +82,5 @@ gstcodecs_dep = declare_dependency(link_with : gstcode
   include_directories : [libsinc],
   sources: gen_sources,
   dependencies : [gstvideo_dep, gstcodecparsers_dep])
-meson.override_dependency(pkg_name, gstcodecs_dep)
\ No newline at end of file
+meson.override_dependency(pkg_name, gstcodecs_dep)
+endif




--- gst-libs/gst/insertbin/meson.build.orig	2022-09-05 21:06:02 UTC
+++ gst-libs/gst/insertbin/meson.build
@@ -1,3 +1,4 @@
+if get_option('insertbin').enabled()
 insert_sources = files('gstinsertbin.c')
 insert_headers = files('gstinsertbin.h')
 install_headers(insert_headers, subdir : 'gstreamer-1.0/gst/insertbin')
@@ -51,3 +52,4 @@ gstinsertbin_dep = declare_dependency(link_with : gsti
   dependencies : [gst_dep])
 
 meson.override_dependency(pkg_name, gstinsertbin_dep)
+endif




--- gst-libs/gst/interfaces/meson.build.orig	2022-09-05 21:08:24 UTC
+++ gst-libs/gst/interfaces/meson.build
@@ -1,3 +1,4 @@
+if get_option('interfaces').enabled()
 photography_sources = ['photography.c']
 photo_headers = ['photography.h', 'photography-prelude.h']
 install_headers(photo_headers, subdir : 'gstreamer-1.0/gst/interfaces')
@@ -40,3 +41,4 @@ gstphotography_dep = declare_dependency(link_with : gs
 
 libraries += [[pkg_name, {'lib': gstphotography}]]
 meson.override_dependency(pkg_name, gstphotography_dep)
+endif




--- gst-libs/gst/isoff/meson.build.orig	2022-09-15 15:00:43 UTC
+++ gst-libs/gst/isoff/meson.build
@@ -1,3 +1,4 @@
+if get_option('isoff').enabled()
 isoff_sources = [
   'gstisoff.c',
 ]
@@ -6,6 +7,8 @@ isoff_headers = [
 ]
 install_headers(isoff_headers, subdir : 'gstreamer-1.0/gst/isoff')
 
+pkg_name = 'gstreamer-isoff-1.0'
+
 gstisoff = library('gstisoff-' + api_version,
   isoff_sources,
   c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ISOFF', '-DG_LOG_DOMAIN="GStreamer-ISOFF"'],
@@ -20,3 +23,4 @@ gstisoff = library('gstisoff-' + api_version,
 gstisoff_dep = declare_dependency(link_with : gstisoff,
   include_directories : [libsinc],
   dependencies : [gstbase_dep])
+endif




--- gst-libs/gst/mpegts/meson.build.orig	2022-09-05 21:11:41 UTC
+++ gst-libs/gst/mpegts/meson.build
@@ -1,3 +1,4 @@
+if get_option('mpegts').enabled()
 mpegts_sources = files(
   'mpegts.c',
   'gstmpegtssection.c',
@@ -82,3 +83,4 @@ gstmpegts_dep = declare_dependency(link_with : gstmpeg
   dependencies : [gst_dep],
   sources : gen_sources)
 meson.override_dependency(pkg_name, gstmpegts_dep)
+endif




--- gst-libs/gst/play/meson.build.orig	2022-09-05 21:13:21 UTC
+++ gst-libs/gst/play/meson.build
@@ -1,3 +1,4 @@
+if get_option('play').enabled()
 gstplay_sources = files(
   'gstplay.c',
   'gstplay-signal-adapter.c',
@@ -74,3 +75,4 @@ gstplay_dep = declare_dependency(link_with : gstplay,
                   gsttag_dep, gstpbutils_dep])
 
 meson.override_dependency(pkg_name, gstplay_dep)
+endif




--- gst-libs/gst/player/meson.build.orig	2022-09-05 21:14:52 UTC
+++ gst-libs/gst/player/meson.build
@@ -1,3 +1,4 @@
+if get_option('player').enabled()
 gstplayer_sources = files([
   'gstplayer.c',
   'gstplayer-signal-dispatcher.c',
@@ -77,3 +78,4 @@ gstplayer_dep = declare_dependency(link_with : gstplay
                   gsttag_dep, gstpbutils_dep])
 
 meson.override_dependency(pkg_name, gstplayer_dep)
+endif




--- gst-libs/gst/sctp/meson.build.orig	2022-09-05 21:16:11 UTC
+++ gst-libs/gst/sctp/meson.build
@@ -1,3 +1,4 @@
+if get_option('sctp').enabled()
 sctp_sources = [
   'sctpreceivemeta.c',
   'sctpsendmeta.c',
@@ -36,3 +37,4 @@ gstsctp_dep = declare_dependency(link_with : libgstsct
   dependencies : [gstbase_dep])
 
 meson.override_dependency(pkg_name, gstsctp_dep)
+endif




--- gst-libs/gst/transcoder/meson.build.orig	2022-09-05 21:18:30 UTC
+++ gst-libs/gst/transcoder/meson.build
@@ -1,3 +1,4 @@
+if get_option('transcoder').enabled()
 sources = files(['gsttranscoder.c', 'gsttranscoder-signal-adapter.c'])
 headers = files(['gsttranscoder.h', 'transcoder-prelude.h', 'gsttranscoder-signal-adapter.h'])
 
@@ -64,3 +65,4 @@ gst_transcoder_dep = declare_dependency(link_with: gst
   include_directories : [libsinc]
 )
 meson.override_dependency(pkg_name, gst_transcoder_dep)
+endif




--- gst-libs/gst/uridownloader/meson.build.orig	2022-09-05 21:20:17 UTC
+++ gst-libs/gst/uridownloader/meson.build
@@ -1,3 +1,4 @@
+if get_option('uridownloader').enabled()
 urid_sources = [
   'gstfragment.c',
   'gsturidownloader.c',
@@ -27,4 +28,5 @@ gsturidownloader_dep = declare_dependency(link_with : 
   dependencies : [gstbase_dep])
 
 libraries += [[pkg_name, {'lib': gsturidownloader}]]
-meson.override_dependency(pkg_name, gsturidownloader_dep)
\ No newline at end of file
+meson.override_dependency(pkg_name, gsturidownloader_dep)
+endif




--- gst-libs/gst/webrtc/meson.build.orig	2022-09-05 21:22:10 UTC
+++ gst-libs/gst/webrtc/meson.build
@@ -1,3 +1,4 @@
+if get_option('webrtc').enabled()
 webrtc_sources = files([
   'dtlstransport.c',
   'icetransport.c',
@@ -95,3 +96,4 @@ gstwebrtc_dep = declare_dependency(link_with: gstwebrt
   dependencies: gstwebrtc_dependencies)
 
 meson.override_dependency(pkg_name, gstwebrtc_dep)
+endif




--- meson.build.orig	2022-09-04 20:06:36 UTC
+++ meson.build
@@ -498,6 +498,7 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
 
 pkgconfig_subdirs = ['gstreamer-1.0']
 
+if get_option('pkgconfig').enabled()
 pkgconfig.generate(
   libraries : [gst_dep],
   variables : pkgconfig_variables,
@@ -505,6 +506,7 @@ pkgconfig.generate(
   name : 'gstreamer-plugins-bad-1.0',
   description : 'Streaming media framework, bad plugins libraries',
 )
+endif
 
 gpl_allowed = get_option('gpl').allowed()
 




--- meson_options.txt.orig	2022-09-04 20:24:08 UTC
+++ meson_options.txt
@@ -1,5 +1,39 @@
 option('gst_play_tests', type: 'boolean', value: false,
        description: 'Enable GstPlay tests that need network access')
+option('adaptivedemux', type: 'feature', value: 'auto',
+       description: 'adaptivedemux lib')
+option('audio', type: 'feature', value: 'auto',
+       description: 'audio lib')
+option('codecparsers', type: 'feature', value: 'auto',
+       description: 'codecparsers lib')
+option('codecs', type: 'feature', value: 'auto',
+       description: 'codecs lib')
+option('basecamerabinsrc', type: 'feature', value: 'auto',
+       description: 'basecamerabinsrc lib')
+option('insertbin', type: 'feature', value: 'auto',
+       description: 'insertbin lib')
+option('interfaces', type: 'feature', value: 'auto',
+       description: 'interfaces lib')
+option('isoff', type: 'feature', value: 'auto',
+       description: 'isoff lib')
+option('mpegts', type: 'feature', value: 'auto',
+       description: 'mpegts lib')
+option('play', type: 'feature', value: 'auto',
+       description: 'play lib')
+option('player', type: 'feature', value: 'auto',
+       description: 'player lib')
+option('transcoder', type: 'feature', value: 'auto',
+       description: 'transcoder lib')
+option('uridownloader', type: 'feature', value: 'auto',
+       description: 'uridownloader lib')
+option('webrtc', type: 'feature', value: 'auto',
+       description: 'webrtc lib')
+option('tools', type: 'feature', value: 'auto',
+       description: 'tools lib')
+option('data', type: 'feature', value: 'auto',
+       description: 'data lib')
+option('pkgconfig', type: 'feature', value: 'auto',
+       description: 'pkgconfig lib')
 
 # Feature options for plugins without external deps
 option('accurip', type : 'feature', value : 'auto')




--- sys/kms/meson.build.orig	2022-09-12 09:58:35 UTC
+++ sys/kms/meson.build
@@ -5,10 +5,6 @@ kmssink_sources = [
   'gstkmsutils.c',
 ]
 
-if host_system != 'linux'
-  subdir_done()
-endif
-
 libdrm_dep = dependency('libdrm', version : '>= 2.4.98',
                         required : get_option('kms'),
                         fallback: ['libdrm', 'ext_libdrm'])




--- sys/msdk/meson.build.orig	2022-09-16 08:39:55 UTC
+++ sys/msdk/meson.build
@@ -169,7 +169,12 @@ if msdk_deps_found
     msdk_sources,
     c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
     include_directories : [configinc, mfx_inc],
-    dependencies : [gstbase_dep, gstvideo_dep, gstpbutils_dep, gstallocators_dep, gstcodecparsers_dep, mfx_dep, msdk_deps],
+    dependencies : [gstbase_dep,
+      dependency('gstreamer-video-1.0', required : true),
+      dependency('gstreamer-pbutils-1.0', required : true),
+      dependency('gstreamer-allocators-1.0', required : true),
+      dependency('gstreamer-codecparsers-1.0', required : true),
+      mfx_dep, msdk_deps],
     install : true,
     install_dir : plugins_install_dir,
   )




--- tests/examples/meson.build.orig	2022-09-13 22:41:40 UTC
+++ tests/examples/meson.build
@@ -1,20 +1,54 @@
-subdir('audiomixmatrix')
-subdir('avsamplesink')
-subdir('camerabin2')
-subdir('codecparsers')
-subdir('d3d11')
-subdir('directfb')
-subdir('ipcpipeline')
-subdir('mpegts')
-subdir('msdk')
-subdir('mxf')
-subdir('nvcodec')
-subdir('opencv', if_found: opencv_dep)
-subdir('uvch264')
-subdir('va')
-subdir('waylandsink')
-subdir('webrtc')
-subdir('wpe')
+if get_option('audiomixmatrix').enabled()
+  subdir('audiomixmatrix')
+endif
+if get_option('applemedia').enabled()
+  subdir('avsamplesink')
+endif
+if get_option('camerabin2').enabled()
+  subdir('camerabin2')
+endif
+if get_option('codecparsers').enabled()
+  subdir('codecparsers')
+endif
+if get_option('d3d11').enabled()
+  subdir('d3d11')
+endif
+if get_option('directfb').enabled()
+  subdir('directfb')
+endif
+if get_option('ipcpipeline').enabled()
+  subdir('ipcpipeline')
+endif
+if get_option('mpegts').enabled()
+  subdir('mpegts')
+endif
+if get_option('msdk').enabled()
+  subdir('msdk')
+endif
+if get_option('mxf').enabled()
+  subdir('mxf')
+endif
+if get_option('nvcodec').enabled()
+  subdir('nvcodec')
+endif
+if get_option('opencv').enabled()
+  subdir('opencv', if_found: opencv_dep)
+endif
+if get_option('uvch264').enabled()
+  subdir('uvch264')
+endif
+if get_option('va').enabled()
+  subdir('va')
+endif
+if get_option('wayland').enabled()
+  subdir('waylandsink')
+endif
+if get_option('webrtc').enabled()
+  subdir('webrtc')
+endif
+if get_option('wpe').enabled()
+  subdir('wpe')
+endif
 
 executable('playout',
   'playout.c',

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-tools_meson.build (+11 lines)
1	--- tools/meson.build.orig 2022-09-05 21:25:23 UTC
2	+++ tools/meson.build
3	@@ -1,6 +1,8 @@
4	+if get_option('tools').enabled()
5	executable('gst-transcoder-' + api_version,
6	'gst-transcoder.c', 'utils.c',
7	install : true,
8	dependencies : [gst_dep, gstpbutils_dep, gst_transcoder_dep],
9	c_args: ['-DG_LOG_DOMAIN="gst-transcoder-@0@"'.format(api_version)],
10	)
11	+endif

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1-plugins-bad/pkg-plist (-10 / +71 lines)
		1	bin/playout
		2	include/gstreamer-%%VERSION%%/gst/adaptivedemux/gstadaptivedemux.h
		3	include/gstreamer-%%VERSION%%/gst/adaptivedemux/adaptive-demux-prelude.h
1	include/gstreamer-%%VERSION%%/gst/audio/audio-bad-prelude.h	4	include/gstreamer-%%VERSION%%/gst/audio/audio-bad-prelude.h
2	include/gstreamer-%%VERSION%%/gst/audio/gstnonstreamaudiodecoder.h	5	include/gstreamer-%%VERSION%%/gst/audio/gstnonstreamaudiodecoder.h
3	include/gstreamer-%%VERSION%%/gst/audio/gstplanaraudioadapter.h	6	include/gstreamer-%%VERSION%%/gst/audio/gstplanaraudioadapter.h
Lines 6-11 include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstbasecamerasrc.h Link Here
6	include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h	9	include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h
7	include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabinpreview.h	10	include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabinpreview.h
8	include/gstreamer-%%VERSION%%/gst/codecparsers/codecparsers-prelude.h	11	include/gstreamer-%%VERSION%%/gst/codecparsers/codecparsers-prelude.h
		12	include/gstreamer-%%VERSION%%/gst/codecparsers/gstav1parser.h
9	include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h	13	include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h
10	include/gstreamer-%%VERSION%%/gst/codecparsers/gsth265parser.h	14	include/gstreamer-%%VERSION%%/gst/codecparsers/gsth265parser.h
11	include/gstreamer-%%VERSION%%/gst/codecparsers/gstjpeg2000sampling.h	15	include/gstreamer-%%VERSION%%/gst/codecparsers/gstjpeg2000sampling.h
Lines 22-36 include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h Link Here
22	include/gstreamer-%%VERSION%%/gst/interfaces/photography-prelude.h	26	include/gstreamer-%%VERSION%%/gst/interfaces/photography-prelude.h
23	include/gstreamer-%%VERSION%%/gst/interfaces/photography.h	27	include/gstreamer-%%VERSION%%/gst/interfaces/photography.h
24	include/gstreamer-%%VERSION%%/gst/isoff/gstisoff.h	28	include/gstreamer-%%VERSION%%/gst/isoff/gstisoff.h
		29	include/gstreamer-%%VERSION%%/gst/mpegts/gst-atsc-descriptor.h
25	include/gstreamer-%%VERSION%%/gst/mpegts/gst-atsc-section.h	30	include/gstreamer-%%VERSION%%/gst/mpegts/gst-atsc-section.h
26	include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-descriptor.h	31	include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-descriptor.h
27	include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-section.h	32	include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-section.h
		33	include/gstreamer-%%VERSION%%/gst/mpegts/gst-hdmv-section.h
		34	include/gstreamer-%%VERSION%%/gst/mpegts/gst-isdb-descriptor.h
28	include/gstreamer-%%VERSION%%/gst/mpegts/gst-scte-section.h	35	include/gstreamer-%%VERSION%%/gst/mpegts/gst-scte-section.h
29	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegts-enumtypes.h	36	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegts-enumtypes.h
30	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h	37	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h
31	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtssection.h	38	include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtssection.h
32	include/gstreamer-%%VERSION%%/gst/mpegts/mpegts-prelude.h	39	include/gstreamer-%%VERSION%%/gst/mpegts/mpegts-prelude.h
33	include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h	40	include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h
		41	include/gstreamer-%%VERSION%%/gst/play/gstplay-media-info.h
		42	include/gstreamer-%%VERSION%%/gst/play/gstplay-signal-adapter.h
		43	include/gstreamer-%%VERSION%%/gst/play/gstplay-types.h
		44	include/gstreamer-%%VERSION%%/gst/play/gstplay-video-overlay-video-renderer.h
		45	include/gstreamer-%%VERSION%%/gst/play/gstplay-video-renderer.h
		46	include/gstreamer-%%VERSION%%/gst/play/gstplay-visualization.h
		47	include/gstreamer-%%VERSION%%/gst/play/gstplay.h
		48	include/gstreamer-%%VERSION%%/gst/play/play-prelude.h
		49	include/gstreamer-%%VERSION%%/gst/play/play.h
34	include/gstreamer-%%VERSION%%/gst/player/gstplayer-g-main-context-signal-dispatcher.h	50	include/gstreamer-%%VERSION%%/gst/player/gstplayer-g-main-context-signal-dispatcher.h
35	include/gstreamer-%%VERSION%%/gst/player/gstplayer-media-info.h	51	include/gstreamer-%%VERSION%%/gst/player/gstplayer-media-info.h
36	include/gstreamer-%%VERSION%%/gst/player/gstplayer-signal-dispatcher.h	52	include/gstreamer-%%VERSION%%/gst/player/gstplayer-signal-dispatcher.h
Lines 44-69 include/gstreamer-%%VERSION%%/gst/player/player.h Link Here
44	include/gstreamer-%%VERSION%%/gst/sctp/sctp-prelude.h	60	include/gstreamer-%%VERSION%%/gst/sctp/sctp-prelude.h
45	include/gstreamer-%%VERSION%%/gst/sctp/sctpreceivemeta.h	61	include/gstreamer-%%VERSION%%/gst/sctp/sctpreceivemeta.h
46	include/gstreamer-%%VERSION%%/gst/sctp/sctpsendmeta.h	62	include/gstreamer-%%VERSION%%/gst/sctp/sctpsendmeta.h
		63	include/gstreamer-%%VERSION%%/gst/transcoder/gsttranscoder-signal-adapter.h
		64	include/gstreamer-%%VERSION%%/gst/transcoder/gsttranscoder.h
		65	include/gstreamer-%%VERSION%%/gst/transcoder/transcoder-enumtypes.h
		66	include/gstreamer-%%VERSION%%/gst/transcoder/transcoder-prelude.h
47	include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h	67	include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h
48	include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h	68	include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h
49	include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h	69	include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h
50	include/gstreamer-%%VERSION%%/gst/uridownloader/uridownloader-prelude.h	70	include/gstreamer-%%VERSION%%/gst/uridownloader/uridownloader-prelude.h
		71	include/gstreamer-%%VERSION%%/gst/webrtc/datachannel.h
51	include/gstreamer-%%VERSION%%/gst/webrtc/dtlstransport.h	72	include/gstreamer-%%VERSION%%/gst/webrtc/dtlstransport.h
52	include/gstreamer-%%VERSION%%/gst/webrtc/icetransport.h	73	include/gstreamer-%%VERSION%%/gst/webrtc/icetransport.h
53	include/gstreamer-%%VERSION%%/gst/webrtc/rtcsessiondescription.h	74	include/gstreamer-%%VERSION%%/gst/webrtc/rtcsessiondescription.h
54	include/gstreamer-%%VERSION%%/gst/webrtc/rtpreceiver.h	75	include/gstreamer-%%VERSION%%/gst/webrtc/rtpreceiver.h
55	include/gstreamer-%%VERSION%%/gst/webrtc/rtpsender.h	76	include/gstreamer-%%VERSION%%/gst/webrtc/rtpsender.h
56	include/gstreamer-%%VERSION%%/gst/webrtc/rtptransceiver.h	77	include/gstreamer-%%VERSION%%/gst/webrtc/rtptransceiver.h
		78	include/gstreamer-%%VERSION%%/gst/webrtc/sctptransport.h
57	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc-enumtypes.h	79	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc-enumtypes.h
58	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc.h	80	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc.h
59	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc_fwd.h	81	include/gstreamer-%%VERSION%%/gst/webrtc/webrtc_fwd.h
60	lib/girepository-1.0/GstInsertBin-%%VERSION%%.typelib	82	lib/girepository-%%VERSION%%/GstBadAudio-%%VERSION%%.typelib
61	lib/girepository-1.0/GstMpegts-%%VERSION%%.typelib	83	lib/girepository-%%VERSION%%/GstCodecs-%%VERSION%%.typelib
62	lib/girepository-1.0/GstPlayer-%%VERSION%%.typelib	84	lib/girepository-%%VERSION%%/GstInsertBin-%%VERSION%%.typelib
63	lib/girepository-1.0/GstWebRTC-%%VERSION%%.typelib	85	lib/girepository-%%VERSION%%/GstMpegts-%%VERSION%%.typelib
		86	lib/girepository-%%VERSION%%/GstPlay-%%VERSION%%.typelib
		87	lib/girepository-%%VERSION%%/GstPlayer-%%VERSION%%.typelib
		88	lib/girepository-%%VERSION%%/GstTranscoder-%%VERSION%%.typelib
		89	lib/girepository-%%VERSION%%/GstWebRTC-%%VERSION%%.typelib
64	lib/gstreamer-%%VERSION%%/libgstaccurip.so	90	lib/gstreamer-%%VERSION%%/libgstaccurip.so
65	lib/gstreamer-%%VERSION%%/libgstadpcmdec.so	91	lib/gstreamer-%%VERSION%%/libgstadpcmdec.so
66	lib/gstreamer-%%VERSION%%/libgstadpcmenc.so	92	lib/gstreamer-%%VERSION%%/libgstadpcmenc.so
		93	lib/gstreamer-%%VERSION%%/libgstaes.so
67	lib/gstreamer-%%VERSION%%/libgstaiff.so	94	lib/gstreamer-%%VERSION%%/libgstaiff.so
68	lib/gstreamer-%%VERSION%%/libgstasfmux.so	95	lib/gstreamer-%%VERSION%%/libgstasfmux.so
69	lib/gstreamer-%%VERSION%%/libgstaudiobuffersplit.so	96	lib/gstreamer-%%VERSION%%/libgstaudiobuffersplit.so
Lines 75-83 lib/gstreamer-%%VERSION%%/libgstautoconvert.so Link Here
75	lib/gstreamer-%%VERSION%%/libgstbayer.so	102	lib/gstreamer-%%VERSION%%/libgstbayer.so
76	lib/gstreamer-%%VERSION%%/libgstbz2.so	103	lib/gstreamer-%%VERSION%%/libgstbz2.so
77	lib/gstreamer-%%VERSION%%/libgstcamerabin.so	104	lib/gstreamer-%%VERSION%%/libgstcamerabin.so
		105	lib/gstreamer-%%VERSION%%/libgstcodecalpha.so
78	lib/gstreamer-%%VERSION%%/libgstcoloreffects.so	106	lib/gstreamer-%%VERSION%%/libgstcoloreffects.so
79	lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.so	107	lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.so
80	lib/gstreamer-%%VERSION%%/libgstdvb.so	108	lib/gstreamer-%%VERSION%%/libgstdvbsubenc.so
81	lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so	109	lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.so
82	lib/gstreamer-%%VERSION%%/libgstdvdspu.so	110	lib/gstreamer-%%VERSION%%/libgstdvdspu.so
83	lib/gstreamer-%%VERSION%%/libgstfaceoverlay.so	111	lib/gstreamer-%%VERSION%%/libgstfaceoverlay.so
Lines 109-115 lib/gstreamer-%%VERSION%%/libgstpnm.so Link Here
109	lib/gstreamer-%%VERSION%%/libgstproxy.so	137	lib/gstreamer-%%VERSION%%/libgstproxy.so
110	lib/gstreamer-%%VERSION%%/libgstremovesilence.so	138	lib/gstreamer-%%VERSION%%/libgstremovesilence.so
111	lib/gstreamer-%%VERSION%%/libgstrfbsrc.so	139	lib/gstreamer-%%VERSION%%/libgstrfbsrc.so
		140	lib/gstreamer-%%VERSION%%/libgstrist.so
		141	lib/gstreamer-%%VERSION%%/libgstrtmp2.so
		142	lib/gstreamer-%%VERSION%%/libgstrtpmanagerbad.so
112	lib/gstreamer-%%VERSION%%/libgstrtponvif.so	143	lib/gstreamer-%%VERSION%%/libgstrtponvif.so
		144	lib/gstreamer-%%VERSION%%/libgstsctp.so
113	lib/gstreamer-%%VERSION%%/libgstsdpelem.so	145	lib/gstreamer-%%VERSION%%/libgstsdpelem.so
114	lib/gstreamer-%%VERSION%%/libgstsegmentclip.so	146	lib/gstreamer-%%VERSION%%/libgstsegmentclip.so
115	lib/gstreamer-%%VERSION%%/libgstshm.so	147	lib/gstreamer-%%VERSION%%/libgstshm.so
Lines 117-130 lib/gstreamer-%%VERSION%%/libgstsiren.so Link Here
117	lib/gstreamer-%%VERSION%%/libgstsmooth.so	149	lib/gstreamer-%%VERSION%%/libgstsmooth.so
118	lib/gstreamer-%%VERSION%%/libgstspeed.so	150	lib/gstreamer-%%VERSION%%/libgstspeed.so
119	lib/gstreamer-%%VERSION%%/libgstsubenc.so	151	lib/gstreamer-%%VERSION%%/libgstsubenc.so
		152	lib/gstreamer-%%VERSION%%/libgstswitchbin.so
120	lib/gstreamer-%%VERSION%%/libgsttimecode.so	153	lib/gstreamer-%%VERSION%%/libgsttimecode.so
		154	lib/gstreamer-%%VERSION%%/libgsttranscode.so
121	lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so	155	lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so
122	lib/gstreamer-%%VERSION%%/libgstvideoframe_audiolevel.so	156	lib/gstreamer-%%VERSION%%/libgstvideoframe_audiolevel.so
123	lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.so	157	lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.so
124	lib/gstreamer-%%VERSION%%/libgstvideosignal.so	158	lib/gstreamer-%%VERSION%%/libgstvideosignal.so
		159	lib/gstreamer-%%VERSION%%/libgstwebrtc.so
125	lib/gstreamer-%%VERSION%%/libgstvmnc.so	160	lib/gstreamer-%%VERSION%%/libgstvmnc.so
126	lib/gstreamer-%%VERSION%%/libgsty4mdec.so	161	lib/gstreamer-%%VERSION%%/libgsty4mdec.so
127	lib/gstreamer-%%VERSION%%/libgstyadif.so
128	lib/libgstadaptivedemux-%%VERSION%%.so	162	lib/libgstadaptivedemux-%%VERSION%%.so
129	lib/libgstadaptivedemux-%%VERSION%%.so.0	163	lib/libgstadaptivedemux-%%VERSION%%.so.0
130	lib/libgstadaptivedemux-%%VERSION%%.so.%%SOVERSION%%	164	lib/libgstadaptivedemux-%%VERSION%%.so.%%SOVERSION%%
Lines 137-142 lib/libgstbasecamerabinsrc-%%VERSION%%.so.%%SOVERSION%% Link Here
137	lib/libgstcodecparsers-%%VERSION%%.so	171	lib/libgstcodecparsers-%%VERSION%%.so
138	lib/libgstcodecparsers-%%VERSION%%.so.0	172	lib/libgstcodecparsers-%%VERSION%%.so.0
139	lib/libgstcodecparsers-%%VERSION%%.so.%%SOVERSION%%	173	lib/libgstcodecparsers-%%VERSION%%.so.%%SOVERSION%%
		174	lib/libgstcodecs-%%VERSION%%.so
		175	lib/libgstcodecs-%%VERSION%%.so.0
		176	lib/libgstcodecs-%%VERSION%%.so.%%SOVERSION%%
140	lib/libgstinsertbin-%%VERSION%%.so	177	lib/libgstinsertbin-%%VERSION%%.so
141	lib/libgstinsertbin-%%VERSION%%.so.0	178	lib/libgstinsertbin-%%VERSION%%.so.0
142	lib/libgstinsertbin-%%VERSION%%.so.%%SOVERSION%%	179	lib/libgstinsertbin-%%VERSION%%.so.%%SOVERSION%%
Lines 149-160 lib/libgstmpegts-%%VERSION%%.so.%%SOVERSION%% Link Here
149	lib/libgstphotography-%%VERSION%%.so	186	lib/libgstphotography-%%VERSION%%.so
150	lib/libgstphotography-%%VERSION%%.so.0	187	lib/libgstphotography-%%VERSION%%.so.0
151	lib/libgstphotography-%%VERSION%%.so.%%SOVERSION%%	188	lib/libgstphotography-%%VERSION%%.so.%%SOVERSION%%
		189	lib/libgstplay-%%VERSION%%.so
		190	lib/libgstplay-%%VERSION%%.so.0
		191	lib/libgstplay-%%VERSION%%.so.%%SOVERSION%%
152	lib/libgstplayer-%%VERSION%%.so	192	lib/libgstplayer-%%VERSION%%.so
153	lib/libgstplayer-%%VERSION%%.so.0	193	lib/libgstplayer-%%VERSION%%.so.0
154	lib/libgstplayer-%%VERSION%%.so.%%SOVERSION%%	194	lib/libgstplayer-%%VERSION%%.so.%%SOVERSION%%
155	lib/libgstsctp-%%VERSION%%.so	195	lib/libgstsctp-%%VERSION%%.so
156	lib/libgstsctp-%%VERSION%%.so.0	196	lib/libgstsctp-%%VERSION%%.so.0
157	lib/libgstsctp-%%VERSION%%.so.%%SOVERSION%%	197	lib/libgstsctp-%%VERSION%%.so.%%SOVERSION%%
		198	lib/libgsttranscoder-%%VERSION%%.so
		199	lib/libgsttranscoder-%%VERSION%%.so.0
158	lib/libgsturidownloader-%%VERSION%%.so	200	lib/libgsturidownloader-%%VERSION%%.so
159	lib/libgsturidownloader-%%VERSION%%.so.0	201	lib/libgsturidownloader-%%VERSION%%.so.0
160	lib/libgsturidownloader-%%VERSION%%.so.%%SOVERSION%%	202	lib/libgsturidownloader-%%VERSION%%.so.%%SOVERSION%%
Lines 165-178 libdata/pkgconfig/gstreamer-bad-audio-%%VERSION%%.pc Link Here
165	libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc	207	libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc
166	libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc	208	libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc
167	libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc	209	libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc
		210	libdata/pkgconfig/gstreamer-photography-%%VERSION%%.pc
		211	libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
168	libdata/pkgconfig/gstreamer-player-%%VERSION%%.pc	212	libdata/pkgconfig/gstreamer-player-%%VERSION%%.pc
169	libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc	213	libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc
170	libdata/pkgconfig/gstreamer-sctp-%%VERSION%%.pc	214	libdata/pkgconfig/gstreamer-sctp-%%VERSION%%.pc
		215	libdata/pkgconfig/gstreamer-transcoder-%%VERSION%%.pc
171	libdata/pkgconfig/gstreamer-webrtc-%%VERSION%%.pc	216	libdata/pkgconfig/gstreamer-webrtc-%%VERSION%%.pc
172	share/gir-1.0/GstInsertBin-%%VERSION%%.gir	217	share/gir-%%VERSION%%/GstBadAudio-%%VERSION%%.gir
173	share/gir-1.0/GstMpegts-%%VERSION%%.gir	218	share/gir-%%VERSION%%/GstCodecs-%%VERSION%%.gir
174	share/gir-1.0/GstPlayer-%%VERSION%%.gir	219	share/gir-%%VERSION%%/GstInsertBin-%%VERSION%%.gir
175	share/gir-1.0/GstWebRTC-%%VERSION%%.gir	220	share/gir-%%VERSION%%/GstMpegts-%%VERSION%%.gir
		221	share/gir-%%VERSION%%/GstPlay-%%VERSION%%.gir
		222	share/gir-%%VERSION%%/GstPlayer-%%VERSION%%.gir
		223	share/gir-%%VERSION%%/GstTranscoder-%%VERSION%%.gir
		224	share/gir-%%VERSION%%/GstWebRTC-%%VERSION%%.gir
		225	%%DATADIR%%-%%VERSION%%/encoding-profiles/device/dvd.gep
		226	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/avi.gep
		227	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/flv.gep
		228	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/mkv.gep
		229	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/mp3.gep
		230	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/mp4.gep
		231	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/oga.gep
		232	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/ogv.gep
		233	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/ts.gep
		234	%%DATADIR%%-%%VERSION%%/encoding-profiles/file-extension/webm.gep
		235	%%DATADIR%%-%%VERSION%%/encoding-profiles/online-services/youtube.gep
176	%%DATADIR%%-%%VERSION%%/presets/GstFreeverb.prs	236	%%DATADIR%%-%%VERSION%%/presets/GstFreeverb.prs
177	share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo	237	share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
178	share/locale/ast/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo	238	share/locale/ast/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
Lines 216-218 share/locale/tr/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo Link Here
216	share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo	276	share/locale/uk/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
217	share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo	277	share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
218	share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo	278	share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
		279	share/locale/zh_TW/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo

Lines 1-5 Link Here

(-)b/multimedia/gstreamer1-plugins-core/Makefile (-1 / +1 lines)
1	PORTNAME= gstreamer1-plugins-core	1	PORTNAME= gstreamer1-plugins-core
2	PORTVERSION= 1.16	2	PORTVERSION= 1.20.3
3	CATEGORIES= multimedia audio	3	CATEGORIES= multimedia audio
4	MASTER_SITES= # empty	4	MASTER_SITES= # empty
5	DISTFILES= # empty	5	DISTFILES= # empty




GST_PLUGIN=	dash
DIST=		bad

DASH_GST_DIRS=	gst-libs/gst/isoff

MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins

PLIST=  ${.CURDIR}/pkg-plist

USE_GNOME= libxml2
.endfor

.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-dash/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstdash.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-dts/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libdca.so:multimedia/libdca
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-dts/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstdtsdec.so

Lines 4-12 PKGNAMESUFFIX= 1-plugins-dv Link Here

(-)b/multimedia/gstreamer1-plugins-dv/Makefile (-1 / +5 lines)
4		4
5	COMMENT= GStreamer dv demux and decoder plugin based on libdv	5	COMMENT= GStreamer dv demux and decoder plugin based on libdv
6		6
7	GST_PLUGIN= libdv	7	GST_PLUGIN= dv
8	DIST= good	8	DIST= good
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	LIB_DEPENDS= libdv.so:multimedia/libdv
		15
12	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-dv/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstdv.so

Lines 8-11 DIST= ugly Link Here

(-)b/multimedia/gstreamer1-plugins-dvdread/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS=libdvdread.so:multimedia/libdvdread
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-dvdread/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstdvdread.so

Lines 7-13 DISTNAME= gnonlin-${PORTVERSION} Link Here

(-)b/multimedia/gstreamer1-plugins-gnonlin/Makefile (-1 / +2 lines)
7	MAINTAINER= multimedia@FreeBSD.org	7	MAINTAINER= multimedia@FreeBSD.org
8	COMMENT= GStreamer library for writing non-linear audio and video	8	COMMENT= GStreamer library for writing non-linear audio and video
9		9
10	USES= gstreamer libtool pkgconfig python:3.4+,build tar:xz	10	USES= gettext-runtime gnome gstreamer libtool pkgconfig python:3.4+,build tar:xz
		11	USE_GNOME= glib20
11	GNU_CONFIGURE= yes	12	GNU_CONFIGURE= yes
12	USE_GSTREAMER= good	13	USE_GSTREAMER= good
13	INSTALL_TARGET= install-strip	14	INSTALL_TARGET= install-strip




MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins

DIST=	good
GOOD_GST_DIRS=	gst sys po

PLIST=		${.CURDIR}/pkg-plist
FILESDIR=	${.CURDIR}/files
PATCHDIR=	${.CURDIR}/files
NO_GSTREAMER_COMMON=	yes

GOOD_GST_ENABLED_PLUGINS=	alpha \
	alpha \
	apetag \
	audiofx \
	audioparsers \
	auparse \
	autodetect \
	avi \
	cutter \
	deinterlace \
	debugutils \
	dtmf \
	effectv \
	equalizer \
	flv \
	flx \
	goom \
	goom2k1 \
	icydemux \
	id3demux \
	imagefreeze \
	interleave \
	isomp4 \
	law \
	level \
	matroska \
	monoscope \
	multifile \
	multipart \
	nls \
	oss \
	oss4 \
	replaygain \
	rtp \
	rtpmanager \
	rtsp \
	shapewipe \
	smpte \
	spectrum \
	tests \
	udp \
	videobox \
	videocrop \
	videofilter \
	videomixer \
	wavenc \
	wavparse \
	y4m

.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqsgtexture.cc (-11 lines)
1	--- ext/qt/gstqsgtexture.cc.orig 2021-08-02 23:41:35 UTC
2	+++ ext/qt/gstqsgtexture.cc
3	@@ -39,7 +39,7 @@ GstQSGTexture::GstQSGTexture ()
4
5	initializeOpenGLFunctions();
6
7	- if (g_once_init_enter (&_debug)) {
8	+ if (g_once_init_enter ((unsigned long *)&_debug)) {
9	GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtqsgtexture", 0,
10	"Qt Scenegraph Texture");
11	g_once_init_leave (&_debug, 1);




--- ext/qt/gstqtglutility.cc.orig	2021-08-02 23:37:36 UTC
+++ ext/qt/gstqtglutility.cc
@@ -62,10 +62,10 @@ gst_qt_get_gl_display ()
 
   g_assert (app != NULL);
 
-  if (g_once_init_enter (&_debug)) {
+  if (g_once_init_enter ((unsigned long *)&_debug)) {
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglutility", 0,
         "Qt gl utility functions");
-    g_once_init_leave (&_debug, 1);
+    g_once_init_leave ((unsigned long *)&_debug, 1);
   }
   GST_INFO ("QGuiApplication::instance()->platformName() %s", app->platformName().toUtf8().data());
 

Removed Link Here

(-)a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtitem.cc (-11 lines)
1	--- ext/qt/qtitem.cc.orig 2021-08-02 23:44:43 UTC
2	+++ ext/qt/qtitem.cc
3	@@ -104,7 +104,7 @@ QtGLVideoItem::QtGLVideoItem()
4	{
5	static volatile gsize _debug;
6
7	- if (g_once_init_enter (&_debug)) {
8	+ if (g_once_init_enter ((unsigned long *)&_debug)) {
9	GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
10	g_once_init_leave (&_debug, 1);
11	}




--- ext/qt/qtwindow.cc.orig	2021-08-02 23:46:48 UTC
+++ ext/qt/qtwindow.cc
@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindo
 
   g_assert (app != NULL);
 
-  if (g_once_init_enter (&_debug)) {
+  if (g_once_init_enter ((unsigned long *)&_debug)) {
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwindow", 0, "Qt GL QuickWindow");
     g_once_init_leave (&_debug, 1);
   }
@@ -153,7 +153,7 @@ QtGLWindow::beforeRendering()
   g_mutex_lock (&this->priv->lock);
 
   static volatile gsize once = 0;
-  if (g_once_init_enter(&once)) {
+  if (g_once_init_enter((unsigned long *)&once)) {
     this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
     g_once_init_leave(&once,1);
   }




--- sys/oss/gstosshelper.c.orig	2014-07-21 10:24:27.000000000 +0200
+++ sys/oss/gstosshelper.c	2014-10-12 18:13:53.847663389 +0200
@@ -82,9 +82,9 @@
 gst_oss_helper_probe_caps (gint fd)
 {
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-  const guint probe_formats[] = { AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 };
+  const guint probe_formats[] = { AFMT_U32_LE, AFMT_S32_LE, AFMT_U24_LE, AFMT_S24_LE, AFMT_S16_LE, AFMT_U16_LE, AFMT_U8, AFMT_S8 };
 #else
-  const guint probe_formats[] = { AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 };
+  const guint probe_formats[] = { AFMT_U32_BE, AFMT_S32_BE, AFMT_U24_BE, AFMT_S24_BE, AFMT_S16_BE, AFMT_U16_BE, AFMT_U8, AFMT_S8 };
 #endif
   GstOssProbe *probe;
   int i, f;
@@ -165,6 +165,9 @@
   const gchar *format;
 
   switch (format_bit) {
+    case AFMT_S8:
+      format = "S8";
+      break;
     case AFMT_U8:
       format = "U8";
       break;
@@ -174,15 +177,36 @@
     case AFMT_S16_BE:
       format = "S16BE";
       break;
-    case AFMT_S8:
-      format = "S8";
-      break;
     case AFMT_U16_LE:
       format = "U16LE";
       break;
     case AFMT_U16_BE:
       format = "U16BE";
       break;
+    case AFMT_S24_LE:
+      format = "S24LE";
+      break;
+    case AFMT_S24_BE:
+      format = "S24BE";
+      break;
+    case AFMT_U24_LE:
+      format = "U24LE";
+      break;
+    case AFMT_U24_BE:
+      format = "U24BE";
+      break;
+    case AFMT_S32_LE:
+      format = "S32LE";
+      break;
+    case AFMT_S32_BE:
+      format = "S32BE";
+      break;
+    case AFMT_U32_LE:
+      format = "U32LE";
+      break;
+    case AFMT_U32_BE:
+      format = "U32BE";
+      break;
     default:
       g_assert_not_reached ();
       return NULL;
@@ -320,13 +344,17 @@
   int format;
   int n_channels;
   int ret;
+  int rst;
 
   rate = irate;
   format = probe->format;
   n_channels = probe->n_channels;
+  rst = 4000; /* XXX Lowest supported rate for FreeBSD. */
 
   GST_LOG ("checking format %d, channels %d, rate %d",
       format, n_channels, rate);
+  /* Reset rate to lowest supported rate. */
+  ioctl (probe->fd, SNDCTL_DSP_SPEED, &rst);
   ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format);
   if (ret < 0 || format != probe->format) {
     GST_DEBUG ("unsupported format: %d (%d)", probe->format, format);




--- sys/oss/gstosssink.c.orig	2013-09-24 15:05:22.000000000 +0200
+++ sys/oss/gstosssink.c	2014-09-11 09:10:55.116013220 +0200
@@ -106,7 +106,10 @@
   PROP_DEVICE,
 };
 
-#define FORMATS "{" GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
+#define FORMATS "{" GST_AUDIO_NE(S32)","GST_AUDIO_NE(U32)"," \
+                    GST_AUDIO_NE(S24)","GST_AUDIO_NE(U24)"," \
+                    GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)"," \
+                    "S8, U8 }"
 
 static GstStaticPadTemplate osssink_sink_factory =
     GST_STATIC_PAD_TEMPLATE ("sink",
@@ -321,6 +324,9 @@
     case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
     {
       switch (rfmt) {
+        case GST_AUDIO_FORMAT_S8:
+          result = AFMT_S8;
+          break;
         case GST_AUDIO_FORMAT_U8:
           result = AFMT_U8;
           break;
@@ -330,15 +336,36 @@
         case GST_AUDIO_FORMAT_S16BE:
           result = AFMT_S16_BE;
           break;
-        case GST_AUDIO_FORMAT_S8:
-          result = AFMT_S8;
-          break;
         case GST_AUDIO_FORMAT_U16LE:
           result = AFMT_U16_LE;
           break;
         case GST_AUDIO_FORMAT_U16BE:
           result = AFMT_U16_BE;
           break;
+        case GST_AUDIO_FORMAT_S24LE:
+          result = AFMT_S24_LE;
+          break;
+        case GST_AUDIO_FORMAT_S24BE:
+          result = AFMT_S24_BE;
+          break;
+        case GST_AUDIO_FORMAT_U24LE:
+          result = AFMT_U24_LE;
+          break;
+        case GST_AUDIO_FORMAT_U24BE:
+          result = AFMT_U24_BE;
+          break;
+        case GST_AUDIO_FORMAT_S32LE:
+          result = AFMT_S32_LE;
+          break;
+        case GST_AUDIO_FORMAT_S32BE:
+          result = AFMT_S32_BE;
+          break;
+        case GST_AUDIO_FORMAT_U32LE:
+          result = AFMT_U32_LE;
+          break;
+        case GST_AUDIO_FORMAT_U32BE:
+          result = AFMT_U32_BE;
+          break;
         default:
           result = 0;
           break;
@@ -441,7 +468,7 @@
   rate = GST_AUDIO_INFO_RATE (&spec->info);
   channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
 
-  if (width != 16 && width != 8)
+  if (width != 32 && width != 24 && width != 16 && width != 8)
     goto dodgy_width;
 
   SET_PARAM (oss, SNDCTL_DSP_SETFMT, tmp, "SETFMT");




--- sys/oss/gstosssrc.c.orig	2013-09-24 15:05:22.000000000 +0200
+++ sys/oss/gstosssrc.c	2014-09-11 09:10:55.116013220 +0200
@@ -100,7 +100,10 @@
 static guint gst_oss_src_delay (GstAudioSrc * asrc);
 static void gst_oss_src_reset (GstAudioSrc * asrc);
 
-#define FORMATS "{" GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)", S8, U8 }"
+#define FORMATS "{" GST_AUDIO_NE(S32)","GST_AUDIO_NE(U32)"," \
+                    GST_AUDIO_NE(S24)","GST_AUDIO_NE(U24)"," \
+                    GST_AUDIO_NE(S16)","GST_AUDIO_NE(U16)"," \
+                    "S8, U8 }"
 
 static GstStaticPadTemplate osssrc_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -314,6 +317,9 @@
     case GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW:
     {
       switch (rfmt) {
+        case GST_AUDIO_FORMAT_S8:
+          result = AFMT_S8;
+          break;
         case GST_AUDIO_FORMAT_U8:
           result = AFMT_U8;
           break;
@@ -323,15 +329,36 @@
         case GST_AUDIO_FORMAT_S16BE:
           result = AFMT_S16_BE;
           break;
-        case GST_AUDIO_FORMAT_S8:
-          result = AFMT_S8;
-          break;
         case GST_AUDIO_FORMAT_U16LE:
           result = AFMT_U16_LE;
           break;
         case GST_AUDIO_FORMAT_U16BE:
           result = AFMT_U16_BE;
           break;
+        case GST_AUDIO_FORMAT_S24LE:
+          result = AFMT_S24_LE;
+          break;
+        case GST_AUDIO_FORMAT_S24BE:
+          result = AFMT_S24_BE;
+          break;
+        case GST_AUDIO_FORMAT_U24LE:
+          result = AFMT_U24_LE;
+          break;
+        case GST_AUDIO_FORMAT_U24BE:
+          result = AFMT_U24_BE;
+          break;
+        case GST_AUDIO_FORMAT_S32LE:
+          result = AFMT_S32_LE;
+          break;
+        case GST_AUDIO_FORMAT_S32BE:
+          result = AFMT_S32_BE;
+          break;
+        case GST_AUDIO_FORMAT_U32LE:
+          result = AFMT_U32_LE;
+          break;
+        case GST_AUDIO_FORMAT_U32BE:
+          result = AFMT_U32_BE;
+          break;
         default:
           result = 0;
           break;
@@ -428,7 +455,7 @@
   rate = GST_AUDIO_INFO_RATE (&spec->info);
   channels = GST_AUDIO_INFO_CHANNELS (&spec->info);
 
-  if (width != 16 && width != 8)
+  if (width != 32 && width != 24 && width != 16 && width != 8)
     goto dodgy_width;
 
   tmp = ilog2 (spec->segsize);




--- sys/v4l2/gstv4l2object.c.orig	2020-04-06 14:45:19 UTC
+++ sys/v4l2/gstv4l2object.c
@@ -2891,8 +2891,9 @@ gst_v4l2_object_is_dmabuf_supported (GstV4l2Object * v
   }
 
   /* Expected to fail, but ENOTTY tells us that it is not implemented. */
+  /* FreeBSD cuse sends EINVAL? */
   v4l2object->ioctl (v4l2object->video_fd, VIDIOC_EXPBUF, &expbuf);
-  if (errno == ENOTTY)
+  if (errno == ENOTTY || errno == EINVAL)
     ret = FALSE;
 
   return ret;




--- sys/v4l2/v4l2_calls.c.orig	2022-09-13 20:56:55 UTC
+++ sys/v4l2/v4l2_calls.c
@@ -1329,10 +1329,12 @@ gst_v4l2_query_dv_timings (GstV4l2Object * v4l2object,
 
   if (ret < 0) {
     switch (errno) {
+#ifdef ENODATA
       case ENODATA:
         GST_DEBUG_OBJECT (v4l2object->dbg_obj,
             "QUERY_DV_TIMINGS not supported for this input/output");
         break;
+#endif
       case ENOLINK:
         GST_DEBUG_OBJECT (v4l2object->dbg_obj,
             "No timings could be detected because no signal was found.");

Lines 24-29 lib/gstreamer-%%VERSION%%/libgstinterleave.so Link Here

(-)b/multimedia/gstreamer1-plugins-good/pkg-plist (+1 lines)
24	lib/gstreamer-%%VERSION%%/libgstisomp4.so	24	lib/gstreamer-%%VERSION%%/libgstisomp4.so
25	lib/gstreamer-%%VERSION%%/libgstlevel.so	25	lib/gstreamer-%%VERSION%%/libgstlevel.so
26	lib/gstreamer-%%VERSION%%/libgstmatroska.so	26	lib/gstreamer-%%VERSION%%/libgstmatroska.so
		27	lib/gstreamer-%%VERSION%%/libgstmonoscope.so
27	lib/gstreamer-%%VERSION%%/libgstmulaw.so	28	lib/gstreamer-%%VERSION%%/libgstmulaw.so
28	lib/gstreamer-%%VERSION%%/libgstmultifile.so	29	lib/gstreamer-%%VERSION%%/libgstmultifile.so
29	lib/gstreamer-%%VERSION%%/libgstmultipart.so	30	lib/gstreamer-%%VERSION%%/libgstmultipart.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-hls/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libnettle.so:security/nettle
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-hls/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgsthls.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-kate/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libkate.so:multimedia/libkate
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-kate/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstkate.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-libde265/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libde265.so:multimedia/libde265
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-libde265/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstde265.so

Lines 8-11 DIST= ugly Link Here

(-)b/multimedia/gstreamer1-plugins-mpeg2dec/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-mpeg2dec/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so

Lines 11-14 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile (+6 lines)
11		11
12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
13		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	LIB_DEPENDS= libmjpegutils.so:multimedia/mjpegtools
		17
		18	MESON_ARGS+= -Dgpl=enabled
		19
14	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-mpeg2enc/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so

Lines 11-14 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-mplex/Makefile (+6 lines)
11		11
12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
13		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	LIB_DEPENDS= libmplex2.so:multimedia/mjpegtools
		17
14	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"
		19
		20	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-mplex/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmplex.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-msdk/Makefile (+7 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \
		14	libmfx.so:multimedia/intel-media-sdk \
		15	libva-drm.so:multimedia/libva \
		16	libdrm.so:graphics/libdrm
		17
11	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-msdk/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstmsdk.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-openh264/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libopenh264.so:multimedia/openh264
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-openh264/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstopenh264.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-resindvd/Makefile (+8 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	BUILD_DEPENDS+= libdvdnav>=4.1.2:multimedia/libdvdnav
		14	LIB_DEPENDS+= libdvdread.so:multimedia/libdvdread
		15	RUN_DEPENDS+= libdvdnav>=4.1.2:multimedia/libdvdnav
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"
		18
		19	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-resindvd/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstresindvd.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-rtmp/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= librtmp.so:multimedia/librtmp
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-rtmp/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstrtmp.so

Lines 10-18 SMOOTH_GST_DIRS= gst-libs/gst/isoff Link Here

(-)b/multimedia/gstreamer1-plugins-smoothstreaming/Makefile (-4 / +3 lines)
10		10
11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
12		12
13	pre-build:	13	PLIST= ${.CURDIR}/pkg-plist
14	.for dir in ${SMOOTH_GST_DIRS}	14
15	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})	15	USE_GNOME= libxml2
16	.endfor
17		16
18	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-smoothstreaming/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsmoothstreaming.so

Lines 8-11 DIST= base Link Here

(-)b/multimedia/gstreamer1-plugins-theora/Makefile (+5 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS+= libtheora.so:multimedia/libtheora \
		14	libogg.so:audio/libogg
		15
11	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-theora/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgsttheora.so

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-ttml/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GNOME= cairo libxml2 pango
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-ttml/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstttmlsubs.so




PORTREVISION=	2
CATEGORIES?=	multimedia audio

COMMENT=	GStreamer-plugins set of good-quality plug-ins that might have distribution problems


MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins

DIST=	ugly
UGLY_GST_DIRS=	gst po gst-libs
NO_GSTREAMER_COMMON=	yes
PLIST=	${.CURDIR}/pkg-plist
UGLY_GST_ENABLED_PLUGINS= asfdemux \
		nls \
		dvdlpcmdec \
		dvdsub \
		realmedia \
		xingmux
do-install:
.for dir in ${UGLY_GST_DIRS}
	@(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
.endfor

.include "${MASTERDIR}/Makefile"




*** meson.build.orig	Fri Sep  2 18:21:32 2022
--- meson.build	Fri Sep  2 18:24:38 2022
***************
*** 117,122 ****
--- 117,125 ----
  cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-ugly-1.0')
  cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
  
+ cdata.set_quoted('DEFAULT_AUDIOSINK', get_option('defaultaudiosink'))
+ cdata.set_quoted('DEFAULT_AUDIOSRC', get_option('defaultaudiosrc'))
+ 
  # GStreamer package name and origin url
  gst_package_name = get_option('package-name')
  if gst_package_name == ''




*** meson_options.txt.orig	Fri Sep  2 18:21:12 2022
--- meson_options.txt	Fri Sep  2 18:22:42 2022
***************
*** 7,12 ****
--- 7,16 ----
  option('dvdsub', type : 'feature', value : 'auto')
  option('realmedia', type : 'feature', value : 'auto')
  option('xingmux', type : 'feature', value : 'auto')
+ option('defaultaudiosink', type : 'string', value : 'autoaudiosink',
+         description: 'set default audio sink')
+ option('defaultaudiosrc', type : 'string', value : 'autoaudiosrc',
+         description: 'set default audio src')
  
  # Feature options for plugins that need external deps
  option('a52dec', type : 'feature', value : 'auto', description : 'Dolby Digital (AC-3) audio decoder plugin based on liba52 (GPL - only built if gpl option is also enabled!)')

Lines 46-48 share/locale/tr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo Link Here

(-)b/multimedia/gstreamer1-plugins-ugly/pkg-plist (+1 lines)
46	share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo	46	share/locale/uk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
47	share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo	47	share/locale/vi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
48	share/locale/zh_CN/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo	48	share/locale/zh_CN/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
		49	share/locale/zh_TW/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo

Lines 4-12 PKGNAMESUFFIX= 1-plugins-v4l2 Link Here

(-)b/multimedia/gstreamer1-plugins-v4l2/Makefile (-1 / +7 lines)
4		4
5	COMMENT= GStreamer Video 4 Linux 2 source plugin	5	COMMENT= GStreamer Video 4 Linux 2 source plugin
6		6
7	GST_PLUGIN= gst_v4l2	7	GST_PLUGIN= v4l2
8	DIST= good	8	DIST= good
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
		15	LIB_DEPENDS= libv4l2.so:multimedia/libv4l
		16	RUN_DEPENDS= webcamd:multimedia/webcamd
		17
12	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-v4l2/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstvideo4linux2.so

Lines 8-11 DIST= good Link Here

(-)b/multimedia/gstreamer1-plugins-vpx/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libvpx.so:multimedia/libvpx
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/multimedia/gstreamer1-plugins-vpx/pkg-plist (+2 lines)
1	lib/gstreamer-%%VERSION%%/libgstvpx.so
2	%%DATADIR%%-%%VERSION%%/presets/GstVP8Enc.prs

Lines 8-11 DIST= ugly Link Here

(-)b/multimedia/gstreamer1-plugins-x264/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libx264.so:multimedia/libx264
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-x264/pkg-plist (+2 lines)
1	lib/gstreamer-%%VERSION%%/libgstx264.so
2	%%DATADIR%%-%%VERSION%%/presets/GstX264Enc.prs

Lines 8-11 DIST= bad Link Here

(-)b/multimedia/gstreamer1-plugins-x265/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libx265.so:multimedia/x265
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/multimedia/gstreamer1-plugins-x265/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstx265.so




PORTVERSION?=	${BASE_PORTVERSION}
# When chasing a shared library for a plug-in bump the PORTREVISION in the
# plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}.
PORTREVISION?=	5
CATEGORIES?=	multimedia audio
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
		https://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
		https://gstreamer.freedesktop.org/src/gst-plugins-good/:good \
		https://gstreamer.freedesktop.org/src/gst-plugins-ugly/:ugly
		http://gstreamer.freedesktop.org/src/gst-plugins-good/:good \
		http://gstreamer.freedesktop.org/src/gst-plugins-ugly/:ugly
PKGNAMESUFFIX?=	1-plugins${GST_PLUGIN_SUFFIX}

MAINTAINER=	multimedia@FreeBSD.org


PORTSCOUT=	limitw:1,even

BASE_PORTVERSION=	1.20.3
BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
BAD_PORTVERSION=	1.20.3
BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
GOOD_PORTVERSION=	1.20.3
GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
UGLY_PORTVERSION=	1.20.3
UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?=		base

USES+=		meson cpe gettext gnome gstreamer libtool pathfix pkgconfig python:3.8+,build shebangfix tar:xz
USE_GNOME+=	glib20 introspection:build libxml2
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
GST_PLUGIN?=	base
USE_LDCONFIG=	yes


CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-lpthread -L${LOCALBASE}/lib ${EXTRA_LIBS}

CONFIGURE_ARGS+=	--disable-fatal-warnings

DEFAULT_AUDIOSINK?=	osssink
DEFAULT_AUDIOSRC?=	osssrc


.endif

VERSION=	1.0
SOVERSION=	0.2003.0
PLIST_SUB+=	VERSION="${VERSION}" \
		SOVERSION="${SOVERSION}"


.if ${GST_PLUGIN} == "base"
DIST=	base
NO_GSTREAMER_COMMON=	yes

BASE_GST_ENABLED_PLUGINS= adder \
													allocators \
													app \
													audio \
													audioconvert \
													audiomixer \
													audiorate \
													audioresample \
													audiotestsrc \
													compositor \
													encoding \
													fft \
													gio \
													nls \
													overlaycomposition \
													pbtypes \
													pkgconfig \
													pbutils \
													playback \
													rawparse \
													riff \
													rtp \
													rtsp \
													sdp \
													subparse \
													tag \
													tcp \
													tools \
													typefind \
													video \
													videoconvert \
													videorate \
													videoscale \
													videotestsrc \
													volume
.endif

.if ${DIST} == base || ${DIST} == ugly
CONFIGURE_ARGS+= -Ddefaultaudiosink="${DEFAULT_AUDIOSINK}" \
		-Ddefaultaudiosrc="${DEFAULT_AUDIOSRC}"
#  --with-default-videosink specify default video sink
#  --with-default-videosrc specify default video source
#  --with-default-visualizer specify default visualizer
CONFIGURE_ARGS+=--with-default-audiosink="${DEFAULT_AUDIOSINK}" \
		--with-default-audiosrc="${DEFAULT_AUDIOSRC}"
.endif

.include "${MASTERDIR}/Makefile.common"

.if ${DIST}=="base"
SHEBANG_FILES= scripts/meson-pkg-config-file-fixup.py \
							 scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

EXTRACT_ONLY=${BASE_DISTFILE}
WRKSRC=${WRKDIR}/${BASE_DISTNAME}
PORTVERSION=	${BASE_PORTVERSION}
DISTFILES+=	${BASE_DISTFILE}:base
PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins/files
.elif ${DIST}=="bad"
SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

EXTRACT_ONLY=${BAD_DISTFILE}
WRKSRC=${WRKDIR}/${BAD_DISTNAME}
PORTVERSION=	${BAD_PORTVERSION}
DISTFILES+=	${BAD_DISTFILE}:bad
PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins-bad/files
.elif ${DIST}=="ugly"
SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

EXTRACT_ONLY=${UGLY_DISTFILE}
WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
PORTVERSION=	${UGLY_PORTVERSION}
DISTFILES+=	${UGLY_DISTFILE}:ugly
PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins-ugly/files
.elif ${DIST}=="good"
SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

EXTRACT_ONLY=${GOOD_DISTFILE}
WRKSRC=${WRKDIR}/${GOOD_DISTNAME}
PORTVERSION=	${GOOD_PORTVERSION}

DEFAULT_DVD_DEVICE=/dev/cd0
.endif

post-patch:
.if ${DIST} == bad
# custom rule to fix opencv detection in configure
#	@${REINPLACE_CMD} -e 's|opencv <= 2.4.8|opencv <= 2.4.9|g' \
#		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
		${WRKSRC}/ext/resindvd/resindvdbin.c \
		${WRKSRC}/ext/resindvd/resindvdsrc.c
# Fix dependency on neon-0.31 and 0.32
	${REINPLACE_CMD} -e '/neon/s|0.30.99|0.32.99|g' \
		${WRKSRC}/configure
# Fix build against OpenCV 4.5.1
	 ${REINPLACE_CMD} '/opencv/s|4\.2\.0|4.6.0|g' \
		 ${WRKSRC}/configure

.endif
.if ${DIST} != ugly
	@${FIND} ${WRKSRC}/ext ${WRKSRC}/sys \
	-name Makefile.in | ${XARGS} -n 10 ${REINPLACE_CMD} -e \
	'/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \
	's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la|-lgsttag-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|-lgstaudio-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|-lgstpbutils-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|-lgstriff-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|-lgstsignalprocessor-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|-lgstbasevideo-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la|-lgstvideo-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-@GST_API_VERSION@.la|-lgstbadbase-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la|-lgsturidownloader-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la|-lgstadaptivedemux-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la|-lgstcodecparsers-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/allocators/libgstbadallocators-@GST_API_VERSION@.la|-lgstbadallocators-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-@GST_API_VERSION@.la|-lgstbadaudio-${VERSION}|; \
	s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-@GST_API_VERSION@.la|-lgstbadvideo-${VERSION}|'

	 @${FIND} ${WRKSRC}/ext ${WRKSRC}/sys -name Makefile.in | \
	 ${XARGS} -n 10 ${REINPLACE_CMD} -e \
	'/la_DEPENDENCIES/,/am__DEPENDENCIES/s,$$(top_builddir)/gst-libs/.*.la,,' -e \
	 's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|-lgsttag-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|-lgstaudio-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|-lgstpbutils-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|-lgstriff-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|-lgstsignalprocessor-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|-lgstbasevideo-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/video/libgstvideo-$$(GST_API_VERSION).la|-lgstvideo-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/base/libgstbadbase-$$(GST_API_VERSION).la|-lgstbadbase-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$$(GST_API_VERSION).la|-lgsturidownloader-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la|-lgstadaptivedemux-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-$$(GST_API_VERSION).la|-lgstcodecparsers-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/allocators/libgstbadallocators-$$(GST_API_VERSION).la|-lgstbadallocators-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$$(GST_API_VERSION).la|-lgstbadaudio-${VERSION}|; \
	  s|$$(top_builddir)/gst-libs/gst/video/libgstbadvideo-$$(GST_API_VERSION).la|-lgstbadvideo-${VERSION}|'
	@${FIND} ${WRKSRC}/ext ${WRKSRC}/gst ${WRKSRC}/gst-libs \
		-name Makefile.in -exec ${REINPLACE_CMD} \
		'/foreach/s/\\#include/#include/' {} +
.endif

.if ${DIST} == bad
# Disable X11 support in librfb
post-configure:
	@${REINPLACE_CMD} -e 's|HAVE_X11 = yes|HAVE_X11 = no|g' \
		-e 's|#ifdef HAVE_X11|#ifdef NO_X11|g' \
		-e 's|$$(X11_CFLAGS) \\|\\|g' \
		-e 's|$$(X11_LIBS) \\|\\|g' \
		${WRKSRC}/gst/librfb/Makefile \
		${WRKSRC}/gst/librfb/gstrfbsrc.c
.endif

pre-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0


Lines 1-608 Link Here

(-)b/multimedia/gstreamer1-plugins/Makefile.common (-487 / +241 lines)
1	BASE_GST_ALL_PLUGINS= \	1	BASE_GST_ALL_PLUGINS+= \
		2	adder \
		3	allocators \
2	alsa \	4	alsa \
		5	app \
		6	audio \
		7	audioconvert \
		8	audiomixer \
		9	audiorate \
		10	audioresample \
		11	audiotestsrc \
3	cdparanoia \	12	cdparanoia \
		13	compositor \
		14	doc \
		15	encoding \
		16	examples \
		17	fft \
		18	gio \
4	gl \	19	gl \
5	ivorbis \
6	libvisual \	20	libvisual \
		21	nls \
7	ogg \	22	ogg \
8	opengl \
9	opus \	23	opus \
		24	overlaycomposition \
10	pango \	25	pango \
		26	pbtypes \
		27	pbutils \
		28	pkgconfig \
		29	playback \
		30	rawparse \
		31	riff \
		32	rtp \
		33	rtsp \
		34	sdp \
		35	subparse \
		36	tag \
		37	tcp \
		38	tests \
11	theora \	39	theora \
		40	tools \
		41	typefind \
		42	video \
		43	videoconvert \
		44	videorate \
		45	videoscale \
		46	videotestsrc \
		47	volume \
12	vorbis \	48	vorbis \
13	x \	49	ximage \
14	xvideo	50	xvideo
15		51
16	BASE_GST_NON_PLUGINS= \	52	BASE_GST_ENABLED_PLUGINS?=
17	--disable-gles2 \
18	--disable-egl \
19	--disable-glx
20		53
21	BAD_GST_ALL_PLUGINS+= \	54	BAD_GST_ALL_PLUGINS+= \
		55	accurip \
		56	adaptivedemux \
		57	adpcmdec \
		58	adpcmenc \
		59	aes \
		60	aiff \
		61	androidmedia \
22	aom \	62	aom \
		63	applemedia \
		64	asfmux \
23	assrender \	65	assrender \
		66	audiobuffersplit \
		67	audiofxbad \
		68	audiolatency \
		69	audiomixmatrix \
		70	audiovisualizers \
		71	autoconvert \
		72	basecamerabinsrc \
		73	bayer \
		74	bluez \
24	bs2b \	75	bs2b \
		76	bz2 \
		77	camerabin2 \
25	chromaprint \	78	chromaprint \
		79	closedcaption \
		80	codecalpha \
		81	codecparsers \
		82	codecs \
		83	coloreffects \
		84	colormanagement \
26	curl \	85	curl \
27	dash \	86	dash \
		87	data \
		88	dc1394 \
		89	debugutils \
		90	directfb \
		91	directsound \
		92	doc \
28	dtls \	93	dtls \
29	dts \	94	dts \
		95	dvb \
		96	dvbsubenc \
		97	dvbsuboverlay \
		98	dvdspu \
		99	examples \
30	faac \	100	faac \
31	faad \	101	faad \
		102	faceoverlay \
		103	festival \
		104	fieldanalysis \
32	flite \	105	flite \
		106	freeverb \
		107	frei0r \
		108	gaudieffects \
		109	gdp \
		110	geometrictransform \
33	gme \	111	gme \
34	gsm \	112	gsm \
35	hls \	113	hls \
		114	id3tag \
		115	insertbin \
		116	inter \
		117	interfaces \
		118	interlace \
		119	ipcpipeline \
		120	isoff \
		121	ivfparse \
		122	ivtc \
		123	jp2kdecimator \
		124	jpegformat \
36	kate \	125	kate \
37	kms \	126	kms \
38	ladspa \	127	ladspa \
39	libde265 \	128	libde265 \
		129	librfb \
40	lv2 \	130	lv2 \
		131	midi \
41	modplug \	132	modplug \
42	mpeg2enc \	133	mpeg2enc \
		134	mpegdemux \
		135	mpegpsmux \
		136	mpegts \
		137	mpegtsdemux \
		138	mpegtsmux \
43	mplex \	139	mplex \
44	msdk \	140	msdk \
45	musepack \	141	musepack \
		142	mxf \
46	neon \	143	neon \
47	ofa \	144	netsim \
		145	nls \
		146	nvcodec \
		147	onvif \
48	openal \	148	openal \
49	opencv \	149	opencv \
50	openexr \	150	openexr \
51	openh264 \	151	openh264 \
52	openjpeg \	152	openjpeg \
53	openmpt \	153	openmpt \
		154	opus \
		155	pcapparse \
		156	pkgconfig \
		157	play \
		158	player \
		159	pnm \
		160	proxy \
		161	rawparse \
		162	removesilence \
54	resindvd \	163	resindvd \
55	rtmp \	164	rist \
56	rsvg \	165	rsvg \
		166	rtmp \
		167	rtmp2 \
		168	rtp \
		169	sbc \
		170	sctp \
		171	sdp \
		172	segmentclip \
		173	shm \
		174	siren \
		175	smooth \
57	smoothstreaming \	176	smoothstreaming \
58	sndfile \	177	sndfile \
59	soundtouch \	178	soundtouch \
60	spandsp \	179	spandsp \
		180	speed \
61	srtp \	181	srtp \
		182	subenc \
		183	switchbin \
		184	tests \
		185	timecode \
		186	tinyalsa \
		187	tools \
		188	transcode \
		189	transcoder \
62	ttml \	190	ttml \
63	vdpau \	191	uridownloader \
		192	uvch264 \
		193	videofilters \
		194	videoframe_audiolevel \
		195	videoparsers \
		196	videosignal \
		197	vmnc \
64	vulkan \	198	vulkan \
		199	wasapi \
65	wayland \	200	wayland \
66	webp \	201	webp \
		202	webrtc \
67	webrtcdsp \	203	webrtcdsp \
		204	winks \
		205	winscreencap \
68	x265 \	206	x265 \
69	zbar \	207	y4m \
		208	zbar
70		209
71	BAD_GST_NON_PLUGINS= \	210	BAD_GST_ENABLED_PLUGINS?=
72	--enable-bz2 \
73	--enable-dvb \
74	--enable-shm \
75	--disable-acm \
76	--disable-android_media \
77	--disable-apple_media \
78	--disable-avc \
79	--disable-bluez \
80	--disable-directfb \
81	--disable-direct3d \
82	--disable-directsound \
83	--disable-nvenc \
84	--disable-nvdec \
85	--disable-sbc \
86	--disable-spc \
87	--disable-tinyalsa \
88	--disable-uvch264 \
89	--disable-vcd \
90	--disable-wasapi \
91	--disable-winks \
92	--disable-winscreencap
93		211
94	GOOD_GST_ALL_PLUGINS+= \	212	GOOD_GST_ALL_PLUGINS+= \
95	aalib \	213	aalib \
		214	alpha \
		215	apetag \
		216	audiofx \
		217	audioparsers \
		218	auparse \
		219	autodetect \
		220	avi \
96	cairo \	221	cairo \
		222	cutter \
		223	debugutils \
		224	deinterlace \
		225	directsound \
		226	dtmf \
		227	dv \
		228	dv1394 \
		229	effectv \
		230	equalizer \
		231	examples \
97	flac \	232	flac \
98	gdk_pixbuf \	233	flv \
99	gst_v4l2 \	234	flx \
		235	gdk-pixbuf \
		236	goom \
		237	goom2k1 \
100	gtk3 \	238	gtk3 \
		239	icydemux \
		240	id3demux \
		241	imagefreeze \
		242	interleave \
		243	isomp4 \
101	jack \	244	jack \
102	jpeg \	245	jpeg \
103	lame \	246	lame \
		247	law \
		248	level \
104	libcaca \	249	libcaca \
105	libdv \	250	matroska \
106	libpng \	251	monoscope \
107	mpg123 \	252	mpg123 \
		253	multifile \
		254	multipart \
		255	nls \
		256	oss \
		257	oss4 \
		258	osxaudio \
		259	osxvideo \
		260	png \
108	pulse \	261	pulse \
109	qt \	262	qt5 \
		263	replaygain \
		264	rtp \
		265	rtpmanager \
		266	rtsp \
		267	shapewipe \
110	shout2 \	268	shout2 \
		269	smpte \
111	soup \	270	soup \
		271	spectrum \
112	speex \	272	speex \
113	taglib \	273	taglib \
		274	tests \
114	twolame \	275	twolame \
		276	udp \
		277	v4l2 \
		278	videobox \
		279	videocrop \
		280	videofilter \
		281	videomixer \
115	vpx \	282	vpx \
		283	waveform \
		284	wavenc \
116	wavpack \	285	wavpack \
117	x	286	wavparse \
		287	ximagesrc \
		288	y4m
118		289
119	GOOD_GST_NON_PLUGINS= \	290	GOOD_GST_ENABLED_PLUGINS?=
120	--disable-dv1394 \
121	--disable-directsound \
122	--disable-osx_audio \
123	--disable-osx_video \
124	--disable-waveform \
125	--enable-bz2 \
126	--enable-oss \
127	--enable-oss4 \
128	--enable-zlib
129		291
130	UGLY_GST_ALL_PLUGINS+= \	292	UGLY_GST_ALL_PLUGINS+= \
131	a52dec \	293	a52dec \
132	amrnb \	294	amrnb \
133	amrwb \	295	amrwbdec \
		296	asfdemux \
134	cdio \	297	cdio \
		298	dvdlpcmdec \
135	dvdread \	299	dvdread \
		300	dvdsub \
136	mpeg2dec \	301	mpeg2dec \
		302	nls \
		303	realmedia \
137	sidplay \	304	sidplay \
138	x264	305	x264 \
		306	xingmux
139		307
140	UGLY_GST_NON_PLUGINS=	308	UGLY_GST_ENABLED_PLUGINS?=
141		309
142	# Disable all plugins by default	310	# Disable all plugins by default
143	.if ${DIST}=="base"	311	.if ${DIST}=="base"
144	.for d in ${BASE_GST_ALL_PLUGINS}	312	.for d in ${BASE_GST_ALL_PLUGINS}
145	CONFIGURE_ARGS+= --disable-${d}	313	CONFIGURE_ARGS+= -D${d}=disabled
		314	.endfor
		315	.for d in ${BASE_GST_ENABLED_PLUGINS}
		316	CONFIGURE_ARGS+= -D${d}=enabled
146	.endfor	317	.endfor
147	CONFIGURE_ARGS+= ${BASE_GST_NON_PLUGINS}
148	.endif	318	.endif
149		319
150	.if ${DIST}=="bad"	320	.if ${DIST}=="bad"
151	.for d in ${BAD_GST_ALL_PLUGINS}	321	.for d in ${BAD_GST_ALL_PLUGINS}
152	CONFIGURE_ARGS+= --disable-${d}	322	CONFIGURE_ARGS+= -D${d}=disabled
		323	.endfor
		324	.for d in ${BAD_GST_ENABLED_PLUGINS}
		325	CONFIGURE_ARGS+= -D${d}=enabled
153	.endfor	326	.endfor
154	CONFIGURE_ARGS+= ${BAD_GST_NON_PLUGINS}
155	.endif	327	.endif
156		328
157	.if ${DIST}=="good"	329	.if ${DIST}=="good"
158	.for d in ${GOOD_GST_ALL_PLUGINS}	330	.for d in ${GOOD_GST_ALL_PLUGINS}
159	CONFIGURE_ARGS+= --disable-${d}	331	CONFIGURE_ARGS+= -D${d}=disabled
		332	.endfor
		333	.for d in ${GOOD_GST_ENABLED_PLUGINS}
		334	CONFIGURE_ARGS+= -D${d}=enabled
160	.endfor	335	.endfor
161	CONFIGURE_ARGS+= ${GOOD_GST_NON_PLUGINS}
162	.endif	336	.endif
163		337
164	.if ${DIST}=="ugly"	338	.if ${DIST}=="ugly"
165	.for d in ${UGLY_GST_ALL_PLUGINS}	339	.for d in ${UGLY_GST_ALL_PLUGINS}
166	CONFIGURE_ARGS+= --disable-${d}	340	CONFIGURE_ARGS+= -D${d}=disabled
		341	.endfor
		342	.for d in ${UGLY_GST_ENABLED_PLUGINS}
		343	CONFIGURE_ARGS+= -D${d}=enabled
167	.endfor	344	.endfor
168	CONFIGURE_ARGS+= ${UGLY_GST_NON_PLUGINS}
169	.endif	345	.endif
170		346
171	.if ${GST_PLUGIN}!="base" && ${GST_PLUGIN}!="bad" && \	347	.if ${GST_PLUGIN}!="base" && ${GST_PLUGIN}!="bad" && \
172	${GST_PLUGIN}!="good" && ${GST_PLUGIN}!="ugly"	348	${GST_PLUGIN}!="good" && ${GST_PLUGIN}!="ugly" && \
173	CONFIGURE_ARGS+= --enable-${GST_PLUGIN}	349	${GST_PLUGIN}!="x"
		350	CONFIGURE_ARGS+= -D${GST_PLUGIN}=enabled
174	.endif	351	.endif
175		352
176	.if !defined(NO_GSTREAMER_COMMON)	353	.if !defined(NO_GSTREAMER_COMMON)
177	GST_PLUGIN_SUFFIX?= -${GST_PLUGIN}	354	GST_PLUGIN_SUFFIX?= -${GST_PLUGIN}
178		355
179	# Enable the right plugin	356	USE_GSTREAMER+= ${DIST:base=}
180	CONFIGURE_ARGS:=${CONFIGURE_ARGS:S\|--disable-${GST_PLUGIN}\|--enable-${GST_PLUGIN}\|}
181		357
182	GST_INC_DIR= include/gstreamer-${VERSION}	358	GST_INC_DIR= include/gstreamer-${VERSION}
183	GST_LIB_DIR= lib/gstreamer-${VERSION}	359	GST_LIB_DIR= lib/gstreamer-${VERSION}
184		360
185	# Auto create PLIST
186	PLIST?= ${NONEXISTENT}
187
188	# ------- plugins ---------
189
190	# a52dec
191	gst_a52dec_LIB_DEPENDS= liba52.so:audio/liba52
192
193	# aalib
194	gst_aalib_LIB_DEPENDS= libaa.so:graphics/aalib
195	gst_aalib_USES= ncurses
196	gst_aalib_PLIST_FILES= ${GST_LIB_DIR}/libgstaasink.so
197
198	# amrnb
199	gst_amrnb_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr
200	gst_amrnb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrnb.so \
201	share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
202
203	# amrwb
204	gst_amrwb_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr
205	gst_amrwb_GST_PLUGIN_DIR= ext/amrwbdec
206	gst_amrwb_PLIST_FILES= ${GST_LIB_DIR}/libgstamrwbdec.so
207
208	# aom
209	gst_aom_LIB_DEPENDS= libaom.so:multimedia/aom
210
211	# assrender
212	gst_assrender_LIB_DEPENDS= libass.so:multimedia/libass
213	gst_assrender_USES= compiler:c11
214
215	# bs2b
216	gst_bs2b_LIB_DEPENDS= libbs2b.so:audio/libbs2b
217
218	# cairo
219	gst_cairo_USE_GNOME= cairo
220
221	# cdparanoia
222	gst_cdparanoia_LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia
223
224	# cdio
225	gst_cdio_LIB_DEPENDS= libcdio.so:sysutils/libcdio
226
227	# chromaprint
228	gst_chromaprint_LIB_DEPENDS= libchromaprint.so:audio/chromaprint
229
230	# curl
231	gst_curl_LIB_DEPENDS= libcurl.so:ftp/curl \
232	libssh2.so:security/libssh2
233
234	# dash
235	gst_dash_USE_GNOME= libxml2
236	gst_dash_PLIST_FILES= ${GST_LIB_DIR}/libgstdashdemux.so
237
238	# dtls
239	gst_dtls_USES= compiler:c11 ssl
240	gst_dtls_CONFIGURE_ENV= DTLS_CFLAGS="-I${OPENSSLINC}" \
241	DTLS_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
242
243	# dts
244	gst_dts_LIB_DEPENDS= libdca.so:multimedia/libdca
245	gst_dts_PLIST_FILES= ${GST_LIB_DIR}/libgstdtsdec.so
246
247	# libdv
248	gst_libdv_LIB_DEPENDS= libdv.so:multimedia/libdv
249	gst_libdv_GST_PLUGIN_DIR= ext/dv
250	gst_libdv_PLIST_FILES= ${GST_LIB_DIR}/libgstdv.so
251
252	# dvdread
253	gst_dvdread_LIB_DEPENDS=libdvdread.so:multimedia/libdvdread
254
255	# faac
256	gst_faac_LIB_DEPENDS= libfaac.so:audio/faac
257
258	# faad
259	gst_faad_LIB_DEPENDS= libfaad.so:audio/faad
260
261	# flac
262	gst_flac_LIB_DEPENDS= libFLAC.so:audio/flac
263
264	# flite
265	gst_flite_LIB_DEPENDS= libflite.so:audio/flite
266
267	# gdk_pixbuf
268	gst_gdk_pixbuf_USE_GNOME= gdkpixbuf2
269	gst_gdk_pixbuf_PLIST_FILES= ${GST_LIB_DIR}/libgstgdkpixbuf.so
270
271	# gl
272	gst_gl_USES= gl
273	gst_gl_USE_GL= gl glu glesv2 egl
274	gst_gl_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
275	gst_gl_LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene
276	gst_gl_CONFIGURE_ARGS= --enable-gl --enable-glx \
277	--enable-egl --enable-gles2
278	gst_gl_GST_PLUGIN_DIR= gst-libs/gst/gl ext/gl
279	gst_gl_PLIST_FILES= #
280
281	# gme
282	gst_gme_LIB_DEPENDS= libgme.so:audio/libgme
283
284	# gsm
285	gst_gsm_LIB_DEPENDS= libgsm.so:audio/gsm
286
287	# gtk3
288	gst_gtk3_USES= gnome
289	gst_gtk3_USE_GSTREAMER= gl
290	gst_gtk3_USE_GNOME= cairo gdkpixbuf2 gtk30
291	gst_gtk3_CONFIGURE_ARGS=--enable-gtk3
292	gst_gtk3_GST_PLUGIN_DIR=ext/gtk
293	gst_gtk3_PLIST_FILES= ${GST_LIB_DIR}/libgstgtk.so
294
295	# hls
296	gst_hls_LIB_DEPENDS= libnettle.so:security/nettle
297
298	# jack
299	gst_jack_LIB_DEPENDS= libjack.so:audio/jack
300
301	# jpeg
302	gst_jpeg_USES= jpeg
303
304	# kate
305	gst_kate_LIB_DEPENDS= libkate.so:multimedia/libkate
306
307	# kms
308	gst_kms_LIB_DEPENDS= libdrm.so:graphics/libdrm
309	gst_kms_GST_PLUGIN_DIR= sys/kms
310
311	# ladspa
312	gst_ladspa_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa
313
314	# lame
315	gst_lame_LIB_DEPENDS= libmp3lame.so:audio/lame
316
317	# libcaca
318	gst_libcaca_LIB_DEPENDS= libcaca.so:graphics/libcaca
319	gst_libcaca_PLIST_FILES= ${GST_LIB_DIR}/libgstcacasink.so
320
321	# libde265
322	gst_libde265_LIB_DEPENDS= libde265.so:multimedia/libde265
323	gst_libde265_PLIST_FILES= ${GST_LIB_DIR}/libgstde265.so
324
325	# librfb
326	gst_librfb_USES= xorg
327	gst_librfb_USE_XORG= x11
328
329	# liblv2
330	gst_lv2_USES= pkgconfig
331	gst_lv2_BUILD_DEPENDS= lv2>=1.14.0:audio/lv2
332	gst_lv2_LIB_DEPENDS= libsord-0.so:devel/sord \
333	libserd-0.so:devel/serd \
334	libsratom-0.so:audio/sratom \
335	liblilv-0.so:audio/lilv
336
337	# png
338	gst_libpng_LIB_DEPENDS= libpng.so:graphics/png
339	gst_libpng_PLIST_FILES= ${GST_LIB_DIR}/libgstpng.so
340
341	# libvisual
342	gst_libvisual_LIB_DEPENDS= libvisual-0.4.so:graphics/libvisual04
343
344	# modplug
345	gst_modplug_LIB_DEPENDS= libmodplug.so:audio/libmodplug
346
347	# mpeg2enc
348	gst_mpeg2enc_LIB_DEPENDS= libmjpegutils.so:multimedia/mjpegtools
349
350	# mpeg2dec
351	gst_mpeg2dec_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2
352
353	# mplex
354	gst_mplex_LIB_DEPENDS= libmplex2.so:multimedia/mjpegtools
355
356	# mpg123
357	gst_mpg123_LIB_DEPENDS= libmpg123.so:audio/mpg123
358
359	# msdk
360	gst_msdk_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \
361	libmfx.so:multimedia/intel-media-sdk \
362	libva-drm.so:multimedia/libva
363	gst_msdk_GST_PLUGIN_DIR= sys/msdk
364
365	# musepack
366	gst_musepack_LIB_DEPENDS=libmpcdec.so:audio/musepack
367
368	# neon
369	gst_neon_LIB_DEPENDS+= libneon.so:www/neon
370	gst_neon_PLIST_FILES= ${GST_LIB_DIR}/libgstneonhttpsrc.so
371
372	# ogg
373	gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg
374
375	# opencv
376	gst_opencv_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv
377	gst_opencv_GST_PLUGIN_DIR= gst-libs/gst/opencv ext/opencv
378	gst_opencv_PLIST_FILES= #
379	gst_opencv_USES= compiler:c++11-lib
380
381	# openexr
382	gst_openexr_LIB_DEPENDS= libOpenEXR.so:graphics/openexr
383
384	# openjpeg
385	gst_openjpeg_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
386
387	# openh264
388	gst_openh264_LIB_DEPENDS= libopenh264.so:multimedia/openh264
389
390	# openmpt
391	gst_openmpt_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt
392
393	# opus
394	gst_opus_LIB_DEPENDS= libopus.so:audio/opus
395
396	# pango
397	gst_pango_USE_GNOME= cairo pango
398
399	# pulse
400	gst_pulse_LIB_DEPENDS= libpulse.so:audio/pulseaudio
401	gst_pulse_PLIST_FILES= ${GST_LIB_DIR}/libgstpulseaudio.so
402
403	# qt
404	gst_qt_USES= compiler:c++11-lang qt:5
405	gst_qt_USE_QT= core gui declarative buildtools_build network x11extras
406	gst_qt_USE_GSTREAMER= gl
407	gst_qt_PLIST_FILES= ${GST_LIB_DIR}/libgstqmlgl.so
408
409	# resindvd
410	gst_resindvd_BUILD_DEPENDS= libdvdnav>=4.1.2:multimedia/libdvdnav
411	gst_resindvd_LIB_DEPENDS= libdvdread.so:multimedia/libdvdread
412	gst_resindvd_RUN_DEPENDS= libdvdnav>=4.1.2:multimedia/libdvdnav
413
414	# rtmp
415	gst_rtmp_LIB_DEPENDS= librtmp.so:multimedia/librtmp
416
417	# rsvg
418	gst_rsvg_USE_GNOME= cairo librsvg2
419
420	# shout2
421	gst_shout2_LIB_DEPENDS= libshout.so:audio/libshout
422
423	# sidplay
424	gst_sidplay_LIB_DEPENDS= libsidplay.so:audio/libsidplay
425	gst_sidplay_PLIST_FILES= ${GST_LIB_DIR}/libgstsid.so
426
427	# smoothstreaming
428	gst_smoothstreaming_USE_GNOME= libxml2
429
430	# sndfile
431	gst_sndfile_LIB_DEPENDS= libsndfile.so:audio/libsndfile
432
433	# soundtouch
434	gst_soundtouch_LIB_DEPENDS= libSoundTouch.so:audio/soundtouch
435
436	# souphttpsrc
437	gst_soup_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
438
439	# spandsp
440	gst_spandsp_LIB_DEPENDS= libspandsp.so:comms/spandsp
441
442	# speex
443	gst_speex_LIB_DEPENDS= libspeex.so:audio/speex
444
445	# srtp
446	gst_srtp_LIB_DEPENDS= libsrtp2.so:net/libsrtp2
447
448	# taglib
449	gst_taglib_LIB_DEPENDS= libtag.so:audio/taglib
450
451	# theora
452	gst_theora_LIB_DEPENDS= libtheora.so:multimedia/libtheora \
453	libogg.so:audio/libogg
454
455	# ttml
456	gst_ttml_USE_GNOME= cairo libxml2 pango
457	gst_ttml_PLIST_FILES= ${GST_LIB_DIR}/libgstttmlsubs.so
458
459	# twolame
460	gst_twolame_LIB_DEPENDS= libtwolame.so:audio/twolame
461
462	# gst_v4l2
463	gst_gst_v4l2_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat
464	gst_gst_v4l2_LIB_DEPENDS= libv4l2.so:multimedia/libv4l
465	gst_gst_v4l2_RUN_DEPENDS= webcamd:multimedia/webcamd
466	gst_gst_v4l2_PLIST_FILES= ${GST_LIB_DIR}/libgstvideo4linux2.so
467	gst_gst_v4l2_GST_PLUGIN_DIR= sys/v4l2
468
469	# vorbis
470	gst_vorbis_USE_GSTREAMER= ogg
471	gst_vorbis_LIB_DEPENDS= libvorbis.so:audio/libvorbis
472
473	# vpx
474	gst_vpx_LIB_DEPENDS= libvpx.so:multimedia/libvpx
475	gst_vpx_PLIST_FILES= ${GST_LIB_DIR}/libgstvpx.so \
476	share/gstreamer-${VERSION}/presets/GstVP8Enc.prs
477
478	# vdpau
479	gst_vdpau_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
480	gst_vdpau_GST_PLUGIN_DIR= sys/vdpau
481
482	# vulkan
483	gst_vulkan_USE_GSTREAMER= gl
484	gst_vulkan_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
485	${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm \
486	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
487	wayland-protocols>=0:graphics/wayland-protocols
488	gst_vulkan_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader \
489	libwayland-client.so:graphics/wayland
490	gst_vulkan_CONFIGURE_ARGS= --enable-wayland
491
492	# webp
493	gst_webp_LIB_DEPENDS= libwebp.so:graphics/webp
494
495	# webrtcdsp
496	gst_webrtcdsp_LIB_DEPENDS= libwebrtc_audio_processing.so:audio/webrtc-audio-processing0
497
498	# X ximage and xvimage sinks aka output
499	.if ${DIST} == base
500	gst_x_USES= xorg
501	gst_x_USE_XORG= x11 xv xext
502	gst_x_CONFIGURE_ARGS= --enable-xvideo --enable-xshm
503	gst_x_GST_PLUGIN_DIR= sys/ximage sys/xvimage
504	gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesink.so \
505	${GST_LIB_DIR}/libgstxvimagesink.so
506	.endif
507
508	.if ${DIST} == good
509	# Ximagesrc
510	gst_x_USES= xorg
511	gst_x_USE_XORG= x11 xfixes xdamage xext
512	gst_x_CONFIGURE_ARGS= --enable-x
513	gst_x_GST_PLUGIN_DIR= sys/ximage
514	gst_x_PLIST_FILES= ${GST_LIB_DIR}/libgstximagesrc.so
515	.endif
516
517	# x264
518	gst_x264_LIB_DEPENDS= libx264.so:multimedia/libx264
519	gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.so \
520	share/gstreamer-${VERSION}/presets/GstX264Enc.prs
521
522	# x265
523	gst_x265_LIB_DEPENDS= libx265.so:multimedia/x265
524
525	# xvid
526	gst_xvid_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
527
528	# wavpack
529	gst_wavpack_LIB_DEPENDS= libwavpack.so:audio/wavpack
530
531	# zbar
532	gst_zbar_LIB_DEPENDS= libzbar.so:graphics/zbar
533
534	.endif # NO_GSTREAMER_COMMON	361	.endif # NO_GSTREAMER_COMMON
535		362
536	.if !defined(NO_GSTREAMER_COMMON)
537	gst_${GST_PLUGIN}_BUILD_DEPENDS?=
538	gst_${GST_PLUGIN}_LIB_DEPENDS?=
539	gst_${GST_PLUGIN}_RUN_DEPENDS?=
540	gst_${GST_PLUGIN}_USES?=
541	gst_${GST_PLUGIN}_USE_QT?=
542	gst_${GST_PLUGIN}_USE_XORG?=
543	gst_${GST_PLUGIN}_PLIST_FILES?= \
544	${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so
545	gst_${GST_PLUGIN}_EXTRA_LIBS?=
546	gst_${GST_PLUGIN}_PREBUILD_DIR?=
547	gst_${GST_PLUGIN}_GST_PLUGIN_DIR?= ext/${GST_PLUGIN}
548	gst_${GST_PLUGIN}_POSTBUILD_DIR?=
549	gst_${GST_PLUGIN}_USE_XORG?=
550	gst_${GST_PLUGIN}_USE_GNOME?=
551	gst_${GST_PLUGIN}_CONFIGURE_ENV?=
552	gst_${GST_PLUGIN}_USE_GL?=
553	gst_${GST_PLUGIN}_GLIB_SCHEMAS?=
554	gst_${GST_PLUGIN}_CONFIGURE_ARGS?=
555	gst_${GST_PLUGIN}_USE_SDL?=
556	gst_${GST_PLUGIN}_USE_GSTREAMER?=
557
558	BUILD_DEPENDS+= ${gst_${GST_PLUGIN}_BUILD_DEPENDS}
559	LIB_DEPENDS+= ${gst_${GST_PLUGIN}_LIB_DEPENDS}
560	RUN_DEPENDS+= ${gst_${GST_PLUGIN}_RUN_DEPENDS}
561	USES+= ${gst_${GST_PLUGIN}_USES}
562	PLIST_FILES= ${gst_${GST_PLUGIN}_PLIST_FILES}
563	EXTRA_LIBS+= ${gst_${GST_PLUGIN}_EXTRA_LIBS}
564	.if ${gst_${GST_PLUGIN}_USE_XORG}!=""
565	USE_XORG+= ${gst_${GST_PLUGIN}_USE_XORG}
566	.endif
567	.if ${gst_${GST_PLUGIN}_USE_GNOME}!=""
568	USE_GNOME+= ${gst_${GST_PLUGIN}_USE_GNOME}
569	.endif
570	.if ${gst_${GST_PLUGIN}_USE_QT}!=""
571	USE_QT+= ${gst_${GST_PLUGIN}_USE_QT}
572	.endif
573	CONFIGURE_ENV+= ${gst_${GST_PLUGIN}_CONFIGURE_ENV}
574	.if ${gst_${GST_PLUGIN}_USE_GL}!=""
575	USE_GL+= ${gst_${GST_PLUGIN}_USE_GL}
576	.endif
577
578	.if ${gst_${GST_PLUGIN}_GLIB_SCHEMAS}!=""
579	GLIB_SCHEMAS= ${gst_${GST_PLUGIN}_GLIB_SCHEMAS}
580	.endif
581
582	CONFIGURE_ARGS+= ${gst_${GST_PLUGIN}_CONFIGURE_ARGS}
583
584	.if ${gst_${GST_PLUGIN}_USE_SDL}!=""
585	USE_SDL= ${gst_${GST_PLUGIN}_USE_SDL}
586	.endif
587
588	USE_GSTREAMER+= ${gst_${GST_PLUGIN}_USE_GSTREAMER} ${DIST:base=}
589	GST_PREBUILD_DIR= ${gst_${GST_PLUGIN}_GST_PREBUILD_DIR}
590	GST_PLUGIN_DIR= ${gst_${GST_PLUGIN}_GST_PLUGIN_DIR}
591	GST_POSTBUILD_DIR= ${gst_${GST_PLUGIN}_GST_POSTBUILD_DIR}
592
593	.if !target(do-build)
594	do-build:
595	.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
596	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
597	${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
598	.endfor
599	.endif
600
601	.if !target(do-install)
602	do-install:
603	.for dir in ${GST_PLUGIN_DIR}
604	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
605	${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
606	.endfor
607	.endif
608	.endif

Lines 1-9 Link Here

(-)b/multimedia/gstreamer1-plugins/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1575818122	1	TIMESTAMP = 1662117432
2	SHA256 (gst-plugins-base-1.16.2.tar.xz) = b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a	2	SHA256 (gst-plugins-base-1.20.3.tar.xz) = 7e30b3dd81a70380ff7554f998471d6996ff76bbe6fc5447096f851e24473c9f
3	SIZE (gst-plugins-base-1.16.2.tar.xz) = 3939868	3	SIZE (gst-plugins-base-1.20.3.tar.xz) = 3299976
4	SHA256 (gst-plugins-bad-1.16.2.tar.xz) = f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74	4	SHA256 (gst-plugins-bad-1.20.3.tar.xz) = 7a11c13b55dd1d2386dd902219e41cbfcdda8e1e0aa3e738186c95074b35da4f
5	SIZE (gst-plugins-bad-1.16.2.tar.xz) = 4887812	5	SIZE (gst-plugins-bad-1.20.3.tar.xz) = 6222824
6	SHA256 (gst-plugins-ugly-1.16.2.tar.xz) = 5500415b865e8b62775d4742cbb9f37146a50caecfc0e7a6fc0160d3c560fbca	6	SHA256 (gst-plugins-ugly-1.20.3.tar.xz) = 8caa20789a09c304b49cf563d33cca9421b1875b84fcc187e4a385fa01d6aefd
7	SIZE (gst-plugins-ugly-1.16.2.tar.xz) = 893964	7	SIZE (gst-plugins-ugly-1.20.3.tar.xz) = 508272
8	SHA256 (gst-plugins-good-1.16.2.tar.xz) = 40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319	8	SHA256 (gst-plugins-good-1.20.3.tar.xz) = f8f3c206bf5cdabc00953920b47b3575af0ef15e9f871c0b6966f6d0aa5868b7
9	SIZE (gst-plugins-good-1.16.2.tar.xz) = 3897172	9	SIZE (gst-plugins-good-1.20.3.tar.xz) = 3417252

Removed Link Here

(-)a/multimedia/gstreamer1-plugins/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2013-03-10 14:54:07.000000000 +0000
2	+++ Makefile.in 2013-03-10 14:55:01.000000000 +0000
3	@@ -483,8 +483,6 @@
4	gst-libs \
5	gst sys $(SUBDIRS_EXT) \
6	tools \
7	- tests \
8	- docs \
9	po \
10	common \
11	m4




--- configure.orig	2019-03-02 18:59:35.242374000 +0100
+++ configure	2019-03-02 19:00:32.651461000 +0100
@@ -33987,54 +33987,9 @@
 _ACEOF
 
     fi
-    if test "x$FOUND_CDPARANOIA" = "xyes";
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paranoia_cachemodel_size in -lcdda_paranoia" >&5
-$as_echo_n "checking for paranoia_cachemodel_size in -lcdda_paranoia... " >&6; }
-if ${ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcdda_paranoia -lcdda_interface $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char paranoia_cachemodel_size ();
-int
-main ()
-{
-return paranoia_cachemodel_size ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size=yes
-else
-  ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" >&5
-$as_echo "$ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" >&6; }
-if test "x$ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" = xyes; then :
-  :
-else
-  HAVE_CDPARANOIA=no
-fi
 
-    fi
 
-
-
 elif test $pkg_failed = untried; then
 
 
@@ -34176,51 +34131,6 @@
 cat >>confdefs.h <<_ACEOF
 #define CDPARANOIA_HEADERS_IN_DIR /**/
 _ACEOF
-
-    fi
-    if test "x$FOUND_CDPARANOIA" = "xyes";
-    then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for paranoia_cachemodel_size in -lcdda_paranoia" >&5
-$as_echo_n "checking for paranoia_cachemodel_size in -lcdda_paranoia... " >&6; }
-if ${ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcdda_paranoia -lcdda_interface $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char paranoia_cachemodel_size ();
-int
-main ()
-{
-return paranoia_cachemodel_size ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size=yes
-else
-  ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" >&5
-$as_echo "$ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" >&6; }
-if test "x$ac_cv_lib_cdda_paranoia_paranoia_cachemodel_size" = xyes; then :
-  :
-else
-  HAVE_CDPARANOIA=no
-fi
 
     fi
 

Added Link Here

(-)b/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_meson.build (+11 lines)
1	--- ext/cdparanoia/meson.build.orig 2022-09-08 19:40:48 UTC
2	+++ ext/cdparanoia/meson.build
3	@@ -33,7 +33,7 @@ if cdparanoia_found
4	['gstcdparanoiasrc.c'],
5	include_directories: [configinc, libsinc],
6	c_args : gst_plugins_base_args,
7	- dependencies : cdparanoia_deps + glib_deps + [audio_dep, gst_dep, gst_base_dep],
8	+ dependencies : cdparanoia_deps + glib_deps + [dependency('gstreamer-audio-1.0'), gst_dep, gst_base_dep],
9	install : true,
10	install_dir : plugins_install_dir,
11	)

Added Link Here

(-)b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build (+11 lines)
1	--- ext/gl/meson.build.orig 2022-09-09 09:05:31 UTC
2	+++ ext/gl/meson.build
3	@@ -146,7 +146,7 @@ gstopengl = library('gstopengl',
4	objc_args : gst_plugins_base_args + gl_objc_args + extra_c_args,
5	link_args : noseh_link_args,
6	include_directories : [configinc],
7	- dependencies : [gstgl_dep, video_dep,
8	+ dependencies : [gstgl_dep, dependency('gstreamer-video-1.0'),
9	gst_base_dep, gst_controller_dep, libm] + optional_deps,
10	install : true,
11	install_dir : plugins_install_dir)




--- ext/libvisual/meson.build.orig	2022-09-12 14:49:46 UTC
+++ ext/libvisual/meson.build
@@ -13,7 +13,8 @@ if libvisual_dep.found()
     libvisual_sources,
     c_args : gst_plugins_base_args,
     include_directories: [configinc, libsinc],
-    dependencies : glib_deps + [libvisual_dep, audio_dep, video_dep, pbutils_dep, gst_dep, gst_base_dep],
+    dependencies : glib_deps + [libvisual_dep, dependency('gstreamer-audio-1.0'),
+      dependency('gstreamer-video-1.0'), dependency('gstreamer-pbutils-1.0'), gst_dep, gst_base_dep],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/ogg/meson.build.orig	2022-09-07 20:35:50 UTC
+++ ext/ogg/meson.build
@@ -19,7 +19,9 @@ if ogg_dep.found()
     c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories: [configinc, libsinc],
-    dependencies : glib_deps + [ogg_dep, audio_dep, pbutils_dep, tag_dep, riff_dep, gst_dep, gst_base_dep],
+    dependencies : glib_deps + [ogg_dep, dependency('gstreamer-audio-1.0'),
+      dependency('gstreamer-pbutils-1.0'), dependency('gstreamer-tag-1.0'),
+      dependency('gstreamer-riff-1.0'), gst_dep, gst_base_dep],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/opus/meson.build.orig	2022-09-06 22:11:13 UTC
+++ ext/opus/meson.build
@@ -11,12 +11,15 @@ opus_dep = dependency('opus', version: '>= 0.9.4', req
                       fallback: ['opus', 'opus_dep'], default_options: ['docs=disabled'])
 
 if opus_dep.found()
+  pbutils_dep2 = dependency('gstreamer-pbutils-@0@'.format(api_version))
+  audio_dep2 = dependency('gstreamer-audio-@0@'.format(api_version))
+  tag_dep2 = dependency('gstreamer-tag-@0@'.format(api_version))
   gstopus = library('gstopus',
     opus_sources,
     c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories: [configinc, libsinc],
-    dependencies : glib_deps + [pbutils_dep, tag_dep, audio_dep, gst_dep, gst_base_dep, opus_dep, libm],
+    dependencies : glib_deps + [pbutils_dep2, tag_dep2, audio_dep2, gst_dep, gst_base_dep, opus_dep, libm],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/pango/meson.build.orig	2022-09-16 21:45:01 UTC
+++ ext/pango/meson.build
@@ -18,7 +18,9 @@ if pango_dep.found()
     c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories: [configinc, libsinc],
-    dependencies : glib_deps + [pango_dep, video_dep, gst_dep, gst_base_dep, libm],
+    dependencies : glib_deps + [pango_dep,
+      dependency('gstreamer-video-1.0', required : true),
+      gst_dep, gst_base_dep, libm],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/theora/meson.build.orig	2022-09-13 20:18:31 UTC
+++ ext/theora/meson.build
@@ -21,7 +21,8 @@ if theoradec_dep.found() or theoraenc_dep.found()
     c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories: [configinc, libsinc],
-    dependencies : theora_deps + glib_deps + [video_dep, tag_dep, gst_dep, gst_base_dep],
+    dependencies : theora_deps + glib_deps + [dependency('gstreamer-video-1.0'),
+      dependency('gstreamer-tag-1.0'), gst_base_dep],
     install : true,
     install_dir : plugins_install_dir,
   )




--- ext/vorbis/meson.build.orig	2022-09-07 21:09:11 UTC
+++ ext/vorbis/meson.build
@@ -31,7 +31,8 @@ if vorbis_dep.found()
     c_args : gst_plugins_base_args,
     link_args : noseh_link_args,
     include_directories: [configinc, libsinc],
-    dependencies : vorbis_deps + glib_deps + [audio_dep, tag_dep, gst_dep, gst_base_dep],
+    dependencies : vorbis_deps + glib_deps + [dependency('gstreamer-audio-1.0'),
+      dependency('gstreamer-tag-1.0'), gst_dep, gst_base_dep],
     install : true,
     install_dir : plugins_install_dir,
   )




--- gst-libs/gst/allocators/meson.build.orig	2022-09-06 20:56:00 UTC
+++ gst-libs/gst/allocators/meson.build
@@ -1,3 +1,4 @@
+if get_option('allocators').enabled()
 gst_allocators_headers = files([
   'allocators.h',
   'allocators-prelude.h',
@@ -58,3 +59,4 @@ allocators_dep = declare_dependency(link_with: gstallo
   sources : allocators_gen_sources)
 
 meson.override_dependency('gstreamer-allocators-1.0', allocators_dep)
+endif




--- gst-libs/gst/app/meson.build.orig	2022-09-06 20:56:57 UTC
+++ gst-libs/gst/app/meson.build
@@ -1,3 +1,4 @@
+if get_option('app').enabled()
 app_sources = files(['gstappsrc.c', 'gstappsink.c'])
 
 app_mkenum_headers = files([
@@ -68,3 +69,4 @@ app_dep = declare_dependency(link_with: gstapp,
   sources : app_gen_sources)
 
 meson.override_dependency(pkg_name, app_dep)
+endif




--- gst-libs/gst/audio/meson.build.orig	2022-09-06 20:57:46 UTC
+++ gst-libs/gst/audio/meson.build
@@ -1,3 +1,4 @@
+if get_option('audio').enabled()
 audio_src = files([
   'audio.c',
   'audio-buffer.c',
@@ -189,3 +190,4 @@ audio_dep = declare_dependency(link_with : gstaudio,
   sources : audio_gen_sources)
 
 meson.override_dependency(pkg_name, audio_dep)
+endif




--- gst-libs/gst/fft/meson.build.orig	2022-09-06 20:58:23 UTC
+++ gst-libs/gst/fft/meson.build
@@ -1,3 +1,4 @@
+if get_option('fft').enabled()
 fft_sources = [
   'gstfft.c',
   'gstffts16.c',
@@ -50,3 +51,4 @@ fft_dep = declare_dependency(link_with: gstfft,
   dependencies : [gst_dep])
 
 meson.override_dependency(pkg_name, fft_dep)
+endif




--- gst-libs/gst/gl/meson.build.orig	2022-09-08 22:01:19 UTC
+++ gst-libs/gst/gl/meson.build
@@ -1049,7 +1049,7 @@ if build_gstgl
     soversion : soversion,
     darwin_versions : osxversion,
     install : true,
-    dependencies : [gst_base_dep, video_dep, allocators_dep, gmodule_dep,
+    dependencies : [gst_base_dep, dependency('gstreamer-video-1.0'), dependency('gstreamer-allocators-1.0'), gmodule_dep,
                     gl_lib_deps, gl_platform_deps, gl_winsys_deps, gl_misc_deps],
     # don't confuse EGL/egl.h with gst-libs/gl/egl/egl.h on case-insensitive file systems
     implicit_include_directories : false)
@@ -1060,10 +1060,10 @@ if build_gstgl
     'gl_apis=' + ' '.join(enabled_gl_apis),
   ]
 
-  library_def = {'lib': pbutils}
+  library_def = {'lib': library('gstpbutils-@0@'.format(api_version))}
   pkg_name = 'gstreamer-gl-1.0'
   pkgconfig.generate(gstgl,
-    libraries : [gstvideo, gst_base_dep, gst_dep],
+    libraries : [library('gstvideo-@0@'.format(api_version)), gst_base_dep, gst_dep],
     variables : pkgconfig_variables + pkgconfig_gl_variables,
     uninstalled_variables : pkgconfig_gl_variables,
     subdirs : pkgconfig_subdirs,
@@ -1095,7 +1095,7 @@ if build_gstgl
         'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
         'install' : true,
         'extra_args' : gir_init_section + ['--c-include=gst/gl/gl.h'],
-        'dependencies' : [video_dep, gst_dep, gst_base_dep],
+        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep],
     }
     library_def += {'gir': [gir]}
     if not static_build
@@ -1107,7 +1107,7 @@ if build_gstgl
   gstgl_dep = declare_dependency(link_with : gstgl,
     include_directories : [libsinc, compat_includes],
     sources: gen_sources,
-    dependencies : [video_dep, gst_base_dep])
+    dependencies : [dependency('gstreamer-video-1.0'), gst_base_dep])
   gstglproto_dep = declare_dependency(dependencies : [gstgl_dep] + gl_lib_deps)
   meson.override_dependency('gstreamer-gl-1.0', gstgl_dep)
   meson.override_dependency('gstreamer-gl-prototypes-1.0', gstglproto_dep)
@@ -1134,7 +1134,7 @@ if build_gstgl
         'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
         'install' : true,
         'extra_args' : gir_init_section + ['--c-include=gst/gl/x11/x11.h'],
-        'dependencies' : [video_dep, gst_dep, gst_base_dep]
+        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
       }
       gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
       libraries += [[pkg_name, {'gir': gir_dict}]]
@@ -1170,7 +1170,7 @@ if build_gstgl
         'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
         'install' : true,
         'extra_args' : gir_init_section + ['--c-include=gst/gl/wayland/wayland.h'],
-        'dependencies' : [video_dep, gst_dep, gst_base_dep]
+        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
       }
 
       gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
@@ -1206,7 +1206,7 @@ if build_gstgl
         'includes' : ['Gst-1.0', 'GstBase-1.0', 'GstVideo-1.0'],
         'install' : true,
         'extra_args' : gir_init_section + ['--c-include=gst/gl/egl/egl.h'],
-        'dependencies' : [video_dep, gst_dep, gst_base_dep]
+        'dependencies' : [dependency('gstreamer-video-1.0'), gst_dep, gst_base_dep]
       }
       gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']}
       libraries += [[pkg_name, {'gir': gir_dict}]]




--- gst-libs/gst/pbutils/meson.build.orig	2022-09-06 20:58:54 UTC
+++ gst-libs/gst/pbutils/meson.build
@@ -1,3 +1,4 @@
+if get_option('pbutils').enabled()
 pbutils_sources = files([
   'gstpluginsbaseversion.c',
   'pbutils.c',
@@ -98,4 +99,5 @@ pbutils_dep = declare_dependency(link_with : pbutils,
   dependencies : gstpbutils_deps,
   sources : pbutils_gen_sources)
 
-meson.override_dependency(pkg_name, pbutils_dep)
\ No newline at end of file
+meson.override_dependency(pkg_name, pbutils_dep)
+endif




--- gst-libs/gst/riff/meson.build.orig	2022-09-06 21:07:15 UTC
+++ gst-libs/gst/riff/meson.build
@@ -1,3 +1,4 @@
+if get_option('riff').enabled()
 riff_sources = [
   'riff.c',
   'riff-media.c',
@@ -62,3 +63,4 @@ riff_dep = declare_dependency(link_with: gstriff,
   sources : riff_gen_sources  )
 
 meson.override_dependency(pkg_name, riff_dep)
+endif




--- gst-libs/gst/rtp/meson.build.orig	2022-09-06 21:07:44 UTC
+++ gst-libs/gst/rtp/meson.build
@@ -1,3 +1,4 @@
+if get_option('rtp').enabled()
 rtp_sources = files([
   'gstrtpbuffer.c',
   'gstrtcpbuffer.c',
@@ -85,3 +86,4 @@ rtp_dep = declare_dependency(link_with : gst_rtp,
   sources : rtp_gen_sources)
 
 meson.override_dependency(pkg_name, rtp_dep)
+endif




--- gst-libs/gst/rtsp/meson.build.orig	2022-09-06 21:08:11 UTC
+++ gst-libs/gst/rtsp/meson.build
@@ -1,3 +1,4 @@
+if get_option('rtsp').enabled()
 rtsp_sources = files([
   'gstrtsptransport.c',
   'gstrtspurl.c',
@@ -90,3 +91,4 @@ rtsp_dep = declare_dependency(link_with : gst_rtsp,
   sources : rtsp_gen_sources)
 
 meson.override_dependency(pkg_name, rtsp_dep)
+endif




--- gst-libs/gst/sdp/meson.build.orig	2022-09-06 21:08:38 UTC
+++ gst-libs/gst/sdp/meson.build
@@ -1,3 +1,4 @@
+if get_option('sdp').enabled()
 gst_sdp_headers = files([
   'sdp.h',
   'sdp-prelude.h',
@@ -60,3 +61,4 @@ sdp_dep = declare_dependency(link_with: gstsdp,
   sources: sdp_gen_sources)
 
 meson.override_dependency(pkg_name, sdp_dep)
+endif




--- gst-libs/gst/tag/meson.build.orig	2022-09-06 21:09:11 UTC
+++ gst-libs/gst/tag/meson.build
@@ -1,3 +1,4 @@
+if get_option('tag').enabled()
 tag_sources = files([
   'gstvorbistag.c',
   'gstid3tag.c',
@@ -142,3 +143,4 @@ executable('mklicensestables', 'mklicensestables.c',
   install : false)
 
 gst_tag_dir = meson.current_source_dir()
+endif




--- gst-libs/gst/video/meson.build.orig	2022-09-06 21:09:42 UTC
+++ gst-libs/gst/video/meson.build
@@ -1,3 +1,4 @@
+if get_option('video').enabled()
 video_sources = files([
   'colorbalance.c',
   'colorbalancechannel.c',
@@ -181,3 +182,4 @@ video_dep = declare_dependency(link_with : gstvideo,
   sources : video_gen_sources)
 
 meson.override_dependency(pkg_name, video_dep)
+endif




--- meson.build.orig	2022-09-03 05:39:18 UTC
+++ meson.build
@@ -17,6 +17,8 @@ endif
 gst_version_is_stable = gst_version_minor.is_even()
 gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90
 
+build_gstgl = false
+
 host_system = host_machine.system()
 
 have_cxx = add_languages('cpp', native: false, required: false)
@@ -282,8 +284,10 @@ core_conf.set_quoted('GST_PACKAGE_ORIGIN', get_option(
 
 # FIXME: These should be configure options
 core_conf.set_quoted('DEFAULT_VIDEOSINK', 'autovideosink')
-core_conf.set_quoted('DEFAULT_AUDIOSINK', 'autoaudiosink')
 
+core_conf.set_quoted('DEFAULT_AUDIOSINK', get_option('defaultaudiosink'))
+core_conf.set_quoted('DEFAULT_AUDIOSRC', get_option('defaultaudiosrc'))
+
 # Set whether the audioresampling method should be detected at runtime
 core_conf.set('AUDIORESAMPLE_FORMAT_' + get_option('audioresample_format').to_upper(), true)
 
@@ -484,6 +488,7 @@ pkgconfig_plugins_base_libs_variables = [
   'libraries=' + ' '.join(base_libraries),
 ]
 
+if get_option('pkgconfig').enabled()
 pkgconfig.generate(
   libraries : [gst_dep],
   variables : pkgconfig_variables + pkgconfig_plugins_base_libs_variables,
@@ -497,6 +502,7 @@ pkgconfig.generate(
 run_command(meson_pkg_config_file_fixup_script,
   'gstreamer-plugins-base-1.0', 'libraries',
   check: true)
+endif
 
 if have_orcc
   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')




--- meson_options.txt.orig	2022-09-06 20:35:43 UTC
+++ meson_options.txt
@@ -1,9 +1,27 @@
+option('tag', type : 'feature', value : 'auto', description : 'tag integration library and tag plugin')
+option('pkgconfig', type : 'feature', value : 'auto', description : 'pkgconfig integration library and pkgconfig plugin')
+option('fft', type : 'feature', value : 'auto', description : 'fft integration library and fft plugin')
+option('video', type : 'feature', value : 'auto', description : 'video integration library and video plugin')
+option('audio', type : 'feature', value : 'auto', description : 'audio integration library and audio plugin')
+option('rtp', type : 'feature', value : 'auto', description : 'rtp integration library and rtp plugin')
+option('pbutils', type : 'feature', value : 'auto', description : 'pbutils integration library and pbutils plugin')
+option('sdp', type : 'feature', value : 'auto', description : 'sdp integration library and sdp plugin')
+option('rtsp', type : 'feature', value : 'auto', description : 'rtsp integration library and rtsp plugin')
+option('riff', type : 'feature', value : 'auto', description : 'riff integration library and riff plugin')
+option('ximage', type : 'feature', value : 'auto', description : 'ximage integration library and ximage plugin')
+option('app', type : 'feature', value : 'auto', description : 'app integration library and app plugin')
+option('allocators', type : 'feature', value : 'auto', description : 'allocators integration library and allocators plugin')
+
 option('audioresample_format', type : 'combo',
        choices : ['int', 'float', 'auto'], value : 'auto')
 option('install_plugins_helper', type: 'string', value: '',
        description: 'Path of distro helper script to call to install missing plugins')
 option('iso-codes', type : 'feature', value : 'auto',
        description: 'Use iso-codes in libgsttag (for language names)')
+option('defaultaudiosink', type : 'string', value : 'autoaudiosink',
+       description: 'set default audio sink')
+option('defaultaudiosrc', type : 'string', value : 'autoaudiosrc',
+       description: 'set default audio src')
 
 # OpenGL integration library options
 option('gl_api', type : 'array', choices : ['opengl', 'gles2', 'auto'], value : ['auto'],




--- sys/ximage/meson.build.orig	2022-09-09 09:10:02 UTC
+++ sys/ximage/meson.build
@@ -1,3 +1,4 @@
+if get_option('ximage').enabled()
 no_warn_args = []
 # XKeycodeToKeysym is deprecated, but we use it when Xkb is unavailable
 if cc.has_argument ('-Wno-deprecated-declarations')
@@ -8,9 +9,10 @@ gstximage = library('gstximagesink',
   'ximagesink.c', 'ximage.c', 'ximagepool.c',
   c_args : gst_plugins_base_args + no_warn_args,
   include_directories: [configinc, libsinc],
-  dependencies : glib_deps + [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep],
+  dependencies : glib_deps + [dependency('gstreamer-video-1.0'), gst_base_dep, gst_dep, x11_dep, xshm_dep],
   install : true,
   install_dir : plugins_install_dir,
 )
 pkgconfig.generate(gstximage, install_dir : plugins_pkgconfig_install_dir)
 plugins += [gstximage]
+endif




--- sys/xvimage/meson.build.orig	2022-09-17 07:37:22 UTC
+++ sys/xvimage/meson.build
@@ -19,7 +19,9 @@ if xvideo_dep.found()
     xvimage_sources,
     c_args : gst_plugins_base_args + no_warn_args,
     include_directories: [configinc, libsinc],
-    dependencies : glib_deps + [video_dep, gst_base_dep, gst_dep, x11_dep, xshm_dep, xvideo_dep, libm],
+    dependencies : glib_deps + [
+      dependency('gstreamer-video-1.0', required : true),
+      gst_base_dep, gst_dep, x11_dep, xshm_dep, xvideo_dep, libm],
     install : true,
     install_dir : plugins_install_dir,
   )




include/gstreamer-%%VERSION%%/gst/video/colorbalancechannel.h
include/gstreamer-%%VERSION%%/gst/video/gstvideoaffinetransformationmeta.h
include/gstreamer-%%VERSION%%/gst/video/gstvideoaggregator.h
include/gstreamer-%%VERSION%%/gst/video/gstvideocodecalphameta.h
include/gstreamer-%%VERSION%%/gst/video/gstvideodecoder.h
include/gstreamer-%%VERSION%%/gst/video/gstvideoencoder.h
include/gstreamer-%%VERSION%%/gst/video/gstvideofilter.h

include/gstreamer-%%VERSION%%/gst/video/video-event.h
include/gstreamer-%%VERSION%%/gst/video/video-format.h
include/gstreamer-%%VERSION%%/gst/video/video-frame.h
include/gstreamer-%%VERSION%%/gst/video/video-hdr.h
include/gstreamer-%%VERSION%%/gst/video/video-info.h
include/gstreamer-%%VERSION%%/gst/video/video-multiview.h
include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h

include/gstreamer-%%VERSION%%/gst/video/videodirection.h
include/gstreamer-%%VERSION%%/gst/video/videoorientation.h
include/gstreamer-%%VERSION%%/gst/video/videooverlay.h
lib/girepository-%%VERSION%%/GstAllocators-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstApp-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstAudio-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstPbutils-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstRtp-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstRtsp-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstSdp-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstTag-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstVideo-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstadder.so
lib/gstreamer-%%VERSION%%/libgstapp.so
lib/gstreamer-%%VERSION%%/libgstaudioconvert.so

man/man1/gst-device-monitor-%%VERSION%%.1.gz
man/man1/gst-discoverer-%%VERSION%%.1.gz
man/man1/gst-play-%%VERSION%%.1.gz
share/gir-%%VERSION%%/GstAllocators-%%VERSION%%.gir
share/gir-%%VERSION%%/GstApp-%%VERSION%%.gir
share/gir-%%VERSION%%/GstAudio-%%VERSION%%.gir
share/gir-%%VERSION%%/GstPbutils-%%VERSION%%.gir
share/gir-%%VERSION%%/GstRtp-%%VERSION%%.gir
share/gir-%%VERSION%%/GstRtsp-%%VERSION%%.gir
share/gir-%%VERSION%%/GstSdp-%%VERSION%%.gir
share/gir-%%VERSION%%/GstTag-%%VERSION%%.gir
share/gir-%%VERSION%%/GstVideo-%%VERSION%%.gir
share/gst-plugins-base/%%VERSION%%/license-translations.dict
share/locale/af/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo




PORTNAME=	gstreamer1-rtsp-server
PORTVERSION=	1.20.3
CATEGORIES=	multimedia
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gst-rtsp-server/
DISTNAME=	gst-rtsp-server-${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org

LICENSE=	LGPL20+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		bison gnome gstreamer libtool meson ninja pathfix pkgconfig python:3.8+,build shebangfix tar:xz
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	glib20 introspection:build
USE_GSTREAMER=	good bad
INSTALL_TARGET=	install-strip

PLIST_SUB=	VERSION=1.0 SOVERSION=0.2003.0

SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1-rtsp-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1586566691	1	TIMESTAMP = 1661966465
2	SHA256 (gst-rtsp-server-1.16.2.tar.xz) = de07a2837b3b04820ce68264a4909f70c221b85dbff0cede7926e9cdbb1dc26e	2	SHA256 (gst-rtsp-server-1.20.3.tar.xz) = ee402718be9b127f0e5e66ca4c1b4f42e4926ec93ba307b7ccca5dc6cc9794ca
3	SIZE (gst-rtsp-server-1.16.2.tar.xz) = 693368	3	SIZE (gst-rtsp-server-1.20.3.tar.xz) = 362348




PORTNAME=	gstreamer1-vaapi
PORTVERSION=	1.20.3
PORTREVISION=	3
CATEGORIES=	multimedia
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer-vaapi/
DISTNAME=	gstreamer-vaapi-${PORTVERSION}


LIB_DEPENDS=	libva.so:multimedia/libva

USES=		bison compiler:c11 gettext-runtime gl gnome gstreamer libtool \
	meson ninja pkgconfig python:3.8+,build shebangfix tar:xz xorg
USES=		compiler:c11 gettext-runtime gl gmake gnome gstreamer libtool \
		pkgconfig tar:xz xorg
USE_LDCONFIG=	yes
USE_GNOME=	glib20
USE_GSTREAMER=	bad
USE_GL=		gl
USE_XORG=	x11 xrandr xrender xorgproto



DRM_DESC=	Raw KMS/DRM backend

DRM_MESON_OFF=	-Dwith_drm=no
DRM_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
	libdrm.so:graphics/libdrm

WAYLAND_MESON_OFF=	-Dwith_wayland=no
WAYLAND_LIB_DEPENDS=	libva-wayland.so:multimedia/libva \
	libwayland-client.so:graphics/wayland

SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1-vaapi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575826374	1	TIMESTAMP = 1662144496
2	SHA256 (gstreamer-vaapi-1.16.2.tar.xz) = 191de7b0ab64a85dd0875c990721e7be95518f60e2a9106beca162004ed7c601	2	SHA256 (gstreamer-vaapi-1.20.3.tar.xz) = 6ee99eb316abdde9ad37002915bd8c3867918f6fdc74b7cf2ac4c1ae0d690b45
3	SIZE (gstreamer-vaapi-1.16.2.tar.xz) = 1095012	3	SIZE (gstreamer-vaapi-1.20.3.tar.xz) = 794840




lib/gstreamer-1.0/libgstvaapi.so
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/api-index-full.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/ch01.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/ch02.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/ch03.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-1.0.devhelp2
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-plugin-vaapi.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapidecodebin.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapih263dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapih264dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapih264enc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapih265dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapih265enc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapijpegdec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapijpegenc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapimpeg2dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapimpeg2enc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapimpeg4dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapipostproc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapisink.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapivc1dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapivp8dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapivp8enc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapivp9dec.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-plugins-vaapivp9enc.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/gstreamer-vaapi-running.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/home.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/index.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/left-insensitive.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/left.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/object-tree.html
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/right-insensitive.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/right.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/style.css
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/up-insensitive.png
share/gtk-doc/html/gstreamer-vaapi-plugins-1.0/up.png




PORTNAME=	gstreamer1-validate
PORTVERSION=	1.16.3
CATEGORIES=	multimedia
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gst-validate/
DISTNAME=	gst-validate-${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	Gstreamer element validation suite

LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
		libgstrtspserver-1.0.so:multimedia/gstreamer1-rtsp-server \
		libharfbuzz.so:print/harfbuzz

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

INSTALL_TARGET=	install-strip
USE_PYTHON=	noflavors

PLIST_SUB=	VERSION=1.0 SOVERSION=0.1603.0

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1-validate/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575056805	1	TIMESTAMP = 1662141068
2	SHA256 (gst-validate-1.16.1.tar.xz) = 7f079b9b2a127604b98e297037dc8847ef50f4ce2b508aa2df0cac5b77562899	2	SHA256 (gst-validate-1.16.3.tar.xz) = c2064e887324af6aa476ca669234936711f253b29042f617f1d9f2597c4bf92b
3	SIZE (gst-validate-1.16.1.tar.xz) = 735364	3	SIZE (gst-validate-1.16.3.tar.xz) = 742180




PORTNAME=	gstreamer
PORTVERSION=	1.20.3
CATEGORIES=	multimedia
MASTER_SITES=	https://gstreamer.freedesktop.org/src/gstreamer/
		http://gstreamer.freedesktop.org/src/gstreamer/
PKGNAMESUFFIX=	1

MAINTAINER=	multimedia@FreeBSD.org

LICENSE=	LGPL20+
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		bison libtool gnome meson ninja pkgconfig python:3.8+,build shebangfix tar:xz
USE_GNOME=     glib20 introspection:build
USE_GNOME=	glib20 introspection:build

CONFIGURE_ARGS=	-D tests=disabled \
	-D examples=disabled \
	-D dbghelp=disabled \
	-D doc=disabled
		--disable-examples \
		--disable-failing-tests \
		--disable-fatal-warnings \
		--disable-gtk-doc
CONFIGURE_ENV=	ac_cv_func_register_printf_function="no"
INSTALL_TARGET=	install-strip
PLIST_SUB=	VERSION=${GST10_VERSION} \
		SOVERSION=0.2003.0

USE_LDCONFIG=	yes
GST10_VERSION=	1.0

OPTIONS_DEFFAULT_i386=		LIBUNWIND

NLS_USES=	gettext
NLS_MESON_ENABLED=      nls

LIBUNWIND_DESC=		Libunwind is optionally used by the leaks tracer
LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
LIBUNWIND_MESON_ENABLED=        libunwind

SHEBANG_FILES=  gst/parse/get_flex_version.py \
	scripts/extract-release-date-from-doap-file.py \
	docs/gst-plugins-doc-cache-generator.py
python_OLD_CMD= "/usr/bin/env python3"
python_CMD=     ${SETENV} ${PYTHON_VERSION}

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/multimedia/gstreamer1/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575817893	1	TIMESTAMP = 1661955042
2	SHA256 (gstreamer-1.16.2.tar.xz) = e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e	2	SHA256 (gstreamer-1.20.3.tar.xz) = 607daf64bbbd5fb18af9d17e21c0d22c4d702fffe83b23cb22d1b1af2ca23a2a
3	SIZE (gstreamer-1.16.2.tar.xz) = 3328600	3	SIZE (gstreamer-1.20.3.tar.xz) = 2681088

Removed Link Here

(-)a/multimedia/gstreamer1/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2018-09-16 12:03:27 UTC
2	+++ Makefile.in
3	@@ -569,7 +569,7 @@ top_srcdir = @top_srcdir@
4	DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
5	aclocaldir = $(datadir)/aclocal
6	aclocal_DATA = gst-element-check-1.0.m4
7	-SUBDIRS = pkgconfig gst libs plugins tests docs po m4 common data \
8	+SUBDIRS = pkgconfig gst libs plugins tests po m4 common data \
9	$(am__append_1)
10
11	# These are all the possible subdirs

Removed Link Here

(-)a/multimedia/gstreamer1/files/patch-libs_gst_controller_Makefile.in (-11 lines)
1	--- libs/gst/controller/Makefile.in.orig 2019-12-03 10:52:27 UTC
2	+++ libs/gst/controller/Makefile.in
3	@@ -591,7 +591,7 @@ libgstcontroller_@GST_API_VERSION@_la_CFLAGS = $(GST_O
4	libgstcontroller_@GST_API_VERSION@_la_LIBADD = $(GST_OBJ_LIBS) $(LIBM)
5	libgstcontroller_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
6	CLEANFILES = .gcno .gcda *.gcov $(BUILT_SOURCES) $(am__append_1)
7	-enum_headers = $(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
8	+enum_headers = $(foreach h,$(glib_enum_headers),\n#include \"$(h)\")
9	@HAVE_INTROSPECTION_TRUE@BUILT_GIRSOURCES = GstController-@GST_API_VERSION@.gir
10	@HAVE_INTROSPECTION_TRUE@gir_headers = $(patsubst %,$(srcdir)/%, \
11	@HAVE_INTROSPECTION_TRUE@ $(libgstcontroller_@GST_API_VERSION@_include_HEADERS)) \




include/gstreamer-%%VERSION%%/gst/net/gstnetcontrolmessagemeta.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimepacket.h
include/gstreamer-%%VERSION%%/gst/net/gstnettimeprovider.h
include/gstreamer-%%VERSION%%/gst/net/gstnetutils.h
include/gstreamer-%%VERSION%%/gst/net/gstptpclock.h
include/gstreamer-%%VERSION%%/gst/net/net-prelude.h
include/gstreamer-%%VERSION%%/gst/net/net.h
lib/girepository-%%VERSION%%/Gst-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstBase-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstCheck-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstController-%%VERSION%%.typelib
lib/girepository-%%VERSION%%/GstNet-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstcoreelements.so
lib/gstreamer-%%VERSION%%/libgstcoretracers.so
lib/libgstbase-%%VERSION%%.so

libdata/pkgconfig/gstreamer-check-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
libexec/gstreamer-%%VERSION%%/gst-hotdoc-plugins-scanner
libexec/gstreamer-%%VERSION%%/gst-plugin-scanner
libexec/gstreamer-%%VERSION%%/gst-plugins-doc-cache-generator
@(root,wheel,4755) libexec/gstreamer-%%VERSION%%/gst-ptp-helper
man/man1/gst-inspect-%%VERSION%%.1.gz
man/man1/gst-launch-%%VERSION%%.1.gz
man/man1/gst-stats-%%VERSION%%.1.gz
man/man1/gst-typefind-%%VERSION%%.1.gz
share/aclocal/gst-element-check-%%VERSION%%.m4
share/gdb/auto-load/usr/local/lib/libgstreamer-%%VERSION%%.so.%%SOVERSION%%-gdb.py
share/bash-completion/completions/gst-launch-%%VERSION%%
share/bash-completion/helpers/gst
share/gdb/auto-load%%RESETPREFIX%%/lib/libgstreamer-%%VERSION%%.so.%%SOVERSION%%-gdb.py
share/gir-1.0/Gst-%%VERSION%%.gir
share/gir-1.0/GstBase-%%VERSION%%.gir
share/gir-1.0/GstCheck-%%VERSION%%.gir
share/gir-1.0/GstController-%%VERSION%%.gir
share/gir-1.0/GstNet-%%VERSION%%.gir
%%DATADIR%%-%%VERSION%%/gdb/glib_gobject_helper.py
%%DATADIR%%-%%VERSION%%/gdb/gst_gdb.py
share/gir-%%VERSION%%/Gst-%%VERSION%%.gir
share/gir-%%VERSION%%/GstBase-%%VERSION%%.gir
share/gir-%%VERSION%%/GstCheck-%%VERSION%%.gir
share/gir-%%VERSION%%/GstController-%%VERSION%%.gir
share/gir-%%VERSION%%/GstNet-%%VERSION%%.gir
share/locale/af/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ast/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ca/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/eo/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/eu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/fur/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/hr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ko/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/lt/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/pt_BR/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ro/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/rw/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sl/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/sv/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/tr/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/uk/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/vi/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gstreamer-%%VERSION%%.mo
share/locale/zh_TW/LC_MESSAGES/gstreamer-%%VERSION%%.mo

Lines 8-11 DIST= bad Link Here

(-)b/net/gstreamer1-plugins-srtp/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libsrtp2.so:net/libsrtp2
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/net/gstreamer1-plugins-srtp/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstsrtp.so

Lines 8-11 DIST= bad Link Here

(-)b/security/gstreamer1-plugins-dtls/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USES= compiler:c11 ssl
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/security/gstreamer1-plugins-dtls/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstdtls.so

Lines 8-11 DIST= ugly Link Here

(-)b/sysutils/gstreamer1-plugins-cdio/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS= libcdio.so:sysutils/libcdio
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"
		16
		17	MESON_ARGS+= -Dgpl=enabled

Added Link Here

(-)b/sysutils/gstreamer1-plugins-cdio/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstcdio.so

Lines 8-11 DIST= bad Link Here

(-)b/www/gstreamer1-plugins-neon/Makefile (+4 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	LIB_DEPENDS+= libneon.so:www/neon
		14
11	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/www/gstreamer1-plugins-neon/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstneonhttpsrc.so

Lines 9-12 DIST= good Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk/Makefile (+6 lines)
9		9
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		11
		12	PLIST= ${.CURDIR}/pkg-plist
		13
		14	USES= gnome
		15	USE_GSTREAMER= gl
		16	USE_GNOME= cairo gdkpixbuf2 gtk30
		17
12	.include "${MASTERDIR}/Makefile"	18	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstgtk.so




PORTREVISION= 2
DISTVERSION=	1.16.2
CATEGORIES=	x11-toolkits
GST_PLUGIN_SUFFIX=  -gtk4
		https://gstreamer.freedesktop.org/src/${DISTNAME:S/-${DISTVERSION}//}/
DISTNAME=	gst-plugins-good-${DISTVERSION}

MAINTAINER=	jbeich@FreeBSD.org
COMMENT=	GStreamer GTK4 video sink plugin

GST_PLUGIN= gtk4
DIST=   good

MASTERDIR=  ${.CURDIR}/../../multimedia/gstreamer1-plugins
USES=	gnome
USE_GNOME=	cairo gtk40
USE_GSTREAMER=	gl
MESON_ARGS+=	--auto-features=disabled
PLIST_FILES=	lib/gstreamer-1.0/libgstgtk4.so

EXTRA_PATCHES=	${.CURDIR}/files
PLIST=  ${.CURDIR}/pkg-plist

.include "${MASTERDIR}/Makefile"




--- ext/gtk/gstgtkbasesink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -80,7 +81,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstGtkBaseSink, gst_
     G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
         gst_gtk_base_sink_navigation_interface_init);
     GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_sink,
-        "gtkbasesink", 0, "Gtk Video Sink base class"));
+        "gtkbasesink", 0, "GTK Video Sink base class"));
 
 
 static void
@@ -100,7 +101,7 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
   gobject_class->get_property = gst_gtk_base_sink_get_property;
 
   g_object_class_install_property (gobject_class, PROP_WIDGET,
-      g_param_spec_object ("widget", "Gtk Widget",
+      g_param_spec_object ("widget", "GTK Widget",
           "The GtkWidget to place in the widget hierarchy "
           "(must only be get from the GTK main thread)",
           GTK_TYPE_WIDGET,
@@ -135,10 +136,13 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
           G_MAXINT, G_MAXINT, 1, DEFAULT_VIDEO_PAR_N, DEFAULT_VIDEO_PAR_D,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /* Disabling alpha was removed in GTK4 */
+#if !defined(BUILD_FOR_GTK4)
   g_object_class_install_property (gobject_class, PROP_IGNORE_ALPHA,
       g_param_spec_boolean ("ignore-alpha", "Ignore Alpha",
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
 
   gobject_class->finalize = gst_gtk_base_sink_finalize;
 
@@ -169,6 +173,8 @@ gst_gtk_base_sink_finalize (GObject * object)
 {
   GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);
 
+  GST_DEBUG ("finalizing base sink");
+
   GST_OBJECT_LOCK (gtk_sink);
   if (gtk_sink->window && gtk_sink->window_destroy_id)
     g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id);
@@ -193,6 +199,14 @@ static void
 window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
 {
   GST_OBJECT_LOCK (gtk_sink);
+  if (gtk_sink->widget) {
+    if (gtk_sink->widget_destroy_id) {
+      g_signal_handler_disconnect (gtk_sink->widget,
+          gtk_sink->widget_destroy_id);
+      gtk_sink->widget_destroy_id = 0;
+    }
+    g_clear_object (&gtk_sink->widget);
+  }
   gtk_sink->window = NULL;
   GST_OBJECT_UNLOCK (gtk_sink);
 }
@@ -205,7 +219,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
 
   /* Ensure GTK is initialized, this has no side effect if it was already
    * initialized. Also, we do that lazily, so the application can be first */
-  if (!gtk_init_check (NULL, NULL)) {
+  if (!gtk_init_check (
+#if !defined(BUILD_FOR_GTK4)
+          NULL, NULL
+#endif
+      )) {
     GST_INFO_OBJECT (gtk_sink, "Could not ensure GTK initialization.");
     return NULL;
   }
@@ -224,13 +242,16 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
       g_object_bind_property (gtk_sink, "video-aspect-ratio-override",
       gtk_sink->widget, "video-aspect-ratio-override",
       G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#if !defined(BUILD_FOR_GTK4)
   gtk_sink->bind_ignore_alpha =
       g_object_bind_property (gtk_sink, "ignore-alpha", gtk_sink->widget,
       "ignore-alpha", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#endif
 
   /* Take the floating ref, other wise the destruction of the container will
    * make this widget disappear possibly before we are done. */
   gst_object_ref_sink (gtk_sink->widget);
+
   gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy",
       G_CALLBACK (widget_destroy_cb), gtk_sink);
 
@@ -372,6 +393,9 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
   GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink);
   GtkWidget *toplevel;
+#if defined(BUILD_FOR_GTK4)
+  GtkRoot *root;
+#endif
 
   if (gst_gtk_base_sink_get_widget (gst_sink) == NULL) {
     GST_ERROR_OBJECT (bsink, "Could not ensure GTK initialization.");
@@ -380,19 +404,46 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
 
   /* After this point, gtk_sink->widget will always be set */
 
+#if defined(BUILD_FOR_GTK4)
+  root = gtk_widget_get_root (GTK_WIDGET (gst_sink->widget));
+  if (!GTK_IS_ROOT (root)) {
+    GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gst_sink->widget));
+    if (parent) {
+      GtkWidget *temp_parent;
+      while ((temp_parent = gtk_widget_get_parent (parent)))
+        parent = temp_parent;
+    }
+    toplevel = (parent) ? parent : GTK_WIDGET (gst_sink->widget);
+#else
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gst_sink->widget));
   if (!gtk_widget_is_toplevel (toplevel)) {
+#endif
     /* sanity check */
     g_assert (klass->window_title);
 
     /* User did not add widget its own UI, let's popup a new GtkWindow to
      * make gst-launch-1.0 work. */
-    gst_sink->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gst_sink->window = gtk_window_new (
+#if !defined(BUILD_FOR_GTK4)
+        GTK_WINDOW_TOPLEVEL
+#endif
+        );
     gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
     gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
-    gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
-    gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy",
-        G_CALLBACK (window_destroy_cb), gst_sink);
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_set_child (GTK_WINDOW (
+#else
+    gtk_container_add (GTK_CONTAINER (
+#endif
+            gst_sink->window), toplevel);
+
+    gst_sink->window_destroy_id = g_signal_connect (
+#if defined(BUILD_FOR_GTK4)
+        GTK_WINDOW (gst_sink->window),
+#else
+        gst_sink->window,
+#endif
+        "destroy", G_CALLBACK (window_destroy_cb), gst_sink);
   }
 
   return TRUE;
@@ -411,7 +462,11 @@ gst_gtk_base_sink_stop_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
 
   if (gst_sink->window) {
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_destroy (GTK_WINDOW (gst_sink->window));
+#else
     gtk_widget_destroy (gst_sink->window);
+#endif
     gst_sink->window = NULL;
     gst_sink->widget = NULL;
   }
@@ -432,10 +487,14 @@ gst_gtk_base_sink_stop (GstBaseSink * bsink)
 }
 
 static void
-gst_gtk_widget_show_all_and_unref (GtkWidget * widget)
+gst_gtk_window_show_all_and_unref (GtkWidget * window)
 {
-  gtk_widget_show_all (widget);
-  g_object_unref (widget);
+#if defined(BUILD_FOR_GTK4)
+  gtk_window_present (GTK_WINDOW (window));
+#else
+  gtk_widget_show_all (window);
+#endif
+  g_object_unref (window);
 }
 
 static GstStateChangeReturn
@@ -463,7 +522,7 @@ gst_gtk_base_sink_change_state (GstElement * element, 
       GST_OBJECT_UNLOCK (gtk_sink);
 
       if (window)
-        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_widget_show_all_and_unref,
+        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_window_show_all_and_unref,
             window);
 
       break;




--- ext/gtk/gstgtkbasesink.h.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.h
@@ -51,14 +51,14 @@ GType gst_gtk_base_sink_get_type (void);
 struct _GstGtkBaseSink
 {
   /* <private> */
-  GstVideoSink         parent;
+  GstVideoSink          parent;
 
-  GstVideoInfo         v_info;
+  GstVideoInfo          v_info;
 
   GtkGstBaseWidget     *widget;
 
   /* properties */
-  gboolean             force_aspect_ratio;
+  gboolean              force_aspect_ratio;
   GBinding             *bind_aspect_ratio;
 
   gint                  par_n;
@@ -73,8 +73,8 @@ struct _GstGtkBaseSink
   GBinding             *bind_ignore_alpha;
 
   GtkWidget            *window;
-  gulong               widget_destroy_id;
-  gulong               window_destroy_id;
+  gulong                widget_destroy_id;
+  gulong                window_destroy_id;
 };
 
 /**




--- ext/gtk/gstgtkglsink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkglsink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,6 +24,12 @@
  * @title: gtkglsink
  */
 
+/**
+ * SECTION:element-gtk4glsink
+ * @title: gtk4glsink
+ */
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,6 +37,7 @@
 #include <gst/gl/gstglfuncs.h>
 #include <gst/video/gstvideoaffinetransformationmeta.h>
 
+#include "gtkconfig.h"
 #include "gstgtkglsink.h"
 #include "gtkgstglwidget.h"
 
@@ -65,7 +73,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template =
 #define gst_gtk_gl_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,
     GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink,
-        "gtkglsink", 0, "Gtk GL Video Sink"));
+        GTKCONFIG_GLSINK, 0, GTKCONFIG_NAME " GL Video Sink"));
 GST_ELEMENT_REGISTER_DEFINE (gtkglsink, "gtkglsink", GST_RANK_NONE,
     GST_TYPE_GTK_GL_SINK);
 
@@ -101,7 +109,7 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
   gstbasesink_class->event = gst_gtk_gl_sink_event;
 
   gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new;
-  gstgtkbasesink_class->window_title = "Gtk+ GL renderer";
+  gstgtkbasesink_class->window_title = GTKCONFIG_NAME " GL Renderer";
 
   /**
    * gtkglsink:rotate-method:
@@ -117,9 +125,11 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
           GST_TYPE_VIDEO_ORIENTATION_METHOD, GST_VIDEO_ORIENTATION_IDENTITY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " GL Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL",
-      "Matthew Waters <matthew@centricular.com>");
+      "Matthew Waters <matthew@centricular.com>, "
+      "Rafał Dzięgiel <rafostar.github@gmail.com>");
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_gtk_gl_sink_template);
@@ -202,16 +212,18 @@ gst_gtk_gl_sink_query (GstBaseSink * bsink, GstQuery *
 }
 
 static void
-_size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle,
-    GstGtkGLSink * gtk_sink)
+_size_changed_cb (GtkWidget * widget, gint width,
+    gint height, GstGtkGLSink * gtk_sink)
 {
-  gint scale_factor, width, height;
   gboolean reconfigure;
 
-  scale_factor = gtk_widget_get_scale_factor (widget);
-  width = scale_factor * gtk_widget_get_allocated_width (widget);
-  height = scale_factor * gtk_widget_get_allocated_height (widget);
+  GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
 
+  /* Ignore size changes before widget is negotiated
+   * we are going to queue a resize after negotiation */
+  if (!base_widget->negotiated)
+    return;
+
   GST_OBJECT_LOCK (gtk_sink);
   reconfigure =
       (width != gtk_sink->display_width || height != gtk_sink->display_height);
@@ -220,7 +232,7 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
   GST_OBJECT_UNLOCK (gtk_sink);
 
   if (reconfigure) {
-    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad.");
+    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad");
     gst_pad_push_event (GST_BASE_SINK (gtk_sink)->sinkpad,
         gst_event_new_reconfigure ());
   }
@@ -229,9 +241,9 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
 static void
 destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink)
 {
-  if (gtk_sink->size_allocate_sig_handler) {
-    g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (widget, gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {
@@ -254,29 +266,34 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink)
   gst_widget = GTK_GST_GL_WIDGET (base_sink->widget);
 
   /* Track the allocation size */
-  gtk_sink->size_allocate_sig_handler =
-      g_signal_connect (gst_widget, "size-allocate",
-      G_CALLBACK (_size_changed_cb), gtk_sink);
+  if (!gtk_sink->widget_resize_sig_handler) {
+    gtk_sink->widget_resize_sig_handler =
+        g_signal_connect (gst_widget, "resize",
+        G_CALLBACK (_size_changed_cb), gtk_sink);
+  }
 
-  gtk_sink->widget_destroy_sig_handler =
-      g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
-      gtk_sink);
+  if (!gtk_sink->widget_destroy_sig_handler) {
+    gtk_sink->widget_destroy_sig_handler =
+        g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
+        gtk_sink);
+  }
 
-  _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink);
-
   if (!gtk_gst_gl_widget_init_winsys (gst_widget)) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to initialize OpenGL with Gtk"), (NULL));
+            "Failed to initialize OpenGL with GTK"), (NULL));
     return FALSE;
   }
 
-  gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
-  gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
-  gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
+  if (!gtk_sink->display)
+    gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
+  if (!gtk_sink->context)
+    gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
+  if (!gtk_sink->gtk_context)
+    gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
 
   if (!gtk_sink->display || !gtk_sink->context || !gtk_sink->gtk_context) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to retrieve OpenGL context from Gtk"), (NULL));
+            "Failed to retrieve OpenGL context from GTK"), (NULL));
     return FALSE;
   }
 
@@ -290,7 +307,14 @@ static gboolean
 gst_gtk_gl_sink_stop (GstBaseSink * bsink)
 {
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (bsink);
+  GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (bsink);
 
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (base_sink->widget,
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
+  }
+
   if (gtk_sink->display) {
     gst_object_unref (gtk_sink->display);
     gtk_sink->display = NULL;
@@ -432,10 +456,10 @@ gst_gtk_gl_sink_finalize (GObject * object)
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object);
   GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object);
 
-  if (gtk_sink->size_allocate_sig_handler) {
+  if (gtk_sink->widget_resize_sig_handler) {
     g_signal_handler_disconnect (base_sink->widget,
-        gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-ext_gtk_gstgtkglsink.h (+11 lines)
1	--- ext/gtk/gstgtkglsink.h.orig 2022-06-15 22:36:22 UTC
2	+++ ext/gtk/gstgtkglsink.h
3	@@ -57,7 +57,7 @@ struct _GstGtkGLSink
4	gint display_width;
5	gint display_height;
6
7	- gulong size_allocate_sig_handler;
8	+ gulong widget_resize_sig_handler;
9	gulong widget_destroy_sig_handler;
10	};
11




--- ext/gtk/gstgtksink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtksink.c
@@ -19,15 +19,22 @@
  */
 
 /**
- * SECTION:element-gtkgstsink
- * @title: gtkgstsink
+ * SECTION:element-gtksink
+ * @title: gtksink
  *
  */
 
+/**
+ * SECTION:element-gtk4sink
+ * @title: gtk4sink
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gtkgstwidget.h"
 #include "gstgtksink.h"
 
@@ -49,8 +56,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
 
 #define gst_gtk_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkSink, gst_gtk_sink, GST_TYPE_GTK_BASE_SINK,
-    GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, "gtksink", 0,
-        "Gtk Video Sink"));
+    GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, GTKCONFIG_SINK, 0,
+        GTKCONFIG_NAME " Video Sink"));
 GST_ELEMENT_REGISTER_DEFINE (gtksink, "gtksink", GST_RANK_NONE,
     GST_TYPE_GTK_SINK);
 
@@ -64,9 +71,10 @@ gst_gtk_sink_class_init (GstGtkSinkClass * klass)
   base_class = (GstGtkBaseSinkClass *) klass;
 
   base_class->create_widget = gtk_gst_widget_new;
-  base_class->window_title = "Gtk+ Cairo renderer";
+  base_class->window_title = GTKCONFIG_NAME " Cairo Renderer";
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget",
       "Matthew Waters <matthew@centricular.com>");
 




--- ext/gtk/gstplugin.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstplugin.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -22,28 +23,30 @@
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gstgtksink.h"
-#if defined(HAVE_GTK3_GL)
+#if defined(HAVE_GTK_GL)
 #include "gstgtkglsink.h"
 #endif
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  gboolean ret = FALSE;
-
-  ret |= GST_ELEMENT_REGISTER (gtksink, plugin);
-
-#if defined(HAVE_GTK3_GL)
-  ret |= GST_ELEMENT_REGISTER (gtkglsink, plugin);
+  if (!gst_element_register (plugin, GTKCONFIG_SINK,
+          GST_RANK_NONE, GST_TYPE_GTK_SINK)) {
+    return FALSE;
+  }
+#if defined(HAVE_GTK_GL)
+  if (!gst_element_register (plugin, GTKCONFIG_GLSINK,
+          GST_RANK_NONE, GST_TYPE_GTK_GL_SINK)) {
+    return FALSE;
+  }
 #endif
-
-  return ret;
+  return TRUE;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gtk,
-    "Gtk+ sink",
+    GTKCONFIG_PLUGIN, GTKCONFIG_NAME " sink",
     plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)




--- ext/gtk/gtkconfig.h.orig	2022-09-18 22:21:54 UTC
+++ ext/gtk/gtkconfig.h
@@ -0,0 +1,35 @@
+/*
+ * GStreamer
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if defined(BUILD_FOR_GTK4)
+#define GTKCONFIG_PLUGIN gtk4
+#define GTKCONFIG_NAME "GTK4"
+#define GTKCONFIG_SINK_N gtk4sink
+#define GTKCONFIG_GLSINK_N gtk4glsink
+#define GTKCONFIG_SINK "gtk4sink"
+#define GTKCONFIG_GLSINK "gtk4glsink"
+#else
+#define GTKCONFIG_PLUGIN gtk
+#define GTKCONFIG_NAME "GTK"
+#define GTKCONFIG_SINK_N gtksink
+#define GTKCONFIG_GLSINK_N gtkglsink
+#define GTKCONFIG_SINK "gtksink"
+#define GTKCONFIG_GLSINK "gtkglsink"
+#endif




--- ext/gtk/gtkgstbasewidget.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gtkgstbasewidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -208,7 +209,23 @@ gtk_gst_base_widget_get_preferred_height (GtkWidget * 
     *natural = video_height;
 }
 
+#if defined(BUILD_FOR_GTK4)
 static void
+gtk_gst_base_widget_measure (GtkWidget * widget, GtkOrientation orientation,
+    gint for_size, gint * min, gint * natural,
+    gint * minimum_baseline, gint * natural_baseline)
+{
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    gtk_gst_base_widget_get_preferred_width (widget, min, natural);
+  else
+    gtk_gst_base_widget_get_preferred_height (widget, min, natural);
+
+  *minimum_baseline = -1;
+  *natural_baseline = -1;
+}
+#endif
+
+static void
 gtk_gst_base_widget_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -281,22 +298,46 @@ _gdk_key_to_navigation_string (guint keyval)
   }
 }
 
+static GdkEvent *
+_get_current_event (GtkEventController * controller)
+{
+#if defined(BUILD_FOR_GTK4)
+  return gtk_event_controller_get_current_event (controller);
+#else
+  return gtk_get_current_event ();
+#endif
+}
+
+static void
+_gdk_event_free (GdkEvent * event)
+{
+#if !defined(BUILD_FOR_GTK4)
+  if (event)
+    gdk_event_free (event);
+#endif
+}
+
 static gboolean
-gtk_gst_base_widget_key_event (GtkWidget * widget, GdkEventKey * event)
+gtk_gst_base_widget_key_event (GtkEventControllerKey * key_controller,
+    guint keyval, guint keycode, GdkModifierType state)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (key_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
-      const gchar *str = _gdk_key_to_navigation_string (event->keyval);
-      const gchar *key_type =
-          event->type == GDK_KEY_PRESS ? "key-press" : "key-release";
+      GdkEvent *event = _get_current_event (controller);
+      const gchar *str = _gdk_key_to_navigation_string (keyval);
 
-      if (!str)
-        str = event->string;
-
-      gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      if (str) {
+        const gchar *key_type =
+            gdk_event_get_event_type (event) ==
+            GDK_KEY_PRESS ? "key-press" : "key-release";
+        gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      }
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -371,18 +412,39 @@ gtk_gst_base_widget_display_size_to_stream_size (GtkGs
 }
 
 static gboolean
-gtk_gst_base_widget_button_event (GtkWidget * widget, GdkEventButton * event)
+gtk_gst_base_widget_button_event (
+#if defined(BUILD_FOR_GTK4)
+    GtkGestureClick * gesture,
+#else
+    GtkGestureMultiPress * gesture,
+#endif
+    gint n_press, gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (gesture);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
+      GdkEvent *event = _get_current_event (controller);
       const gchar *key_type =
-          event->type ==
-          GDK_BUTTON_PRESS ? "mouse-button-press" : "mouse-button-release";
+          gdk_event_get_event_type (event) == GDK_BUTTON_PRESS
+          ? "mouse-button-press" : "mouse-button-release";
+#if !defined(BUILD_FOR_GTK4)
+      guint button;
+      gdk_event_get_button (event, &button);
+#endif
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), key_type,
-          event->button, event->x, event->y);
+#if defined(BUILD_FOR_GTK4)
+          /* Gesture is set to ignore other buttons so we do not have to check */
+          GDK_BUTTON_PRIMARY,
+#else
+          button,
+#endif
+          x, y);
+
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -391,15 +453,18 @@ gtk_gst_base_widget_button_event (GtkWidget * widget, 
 }
 
 static gboolean
-gtk_gst_base_widget_motion_event (GtkWidget * widget, GdkEventMotion * event)
+gtk_gst_base_widget_motion_event (GtkEventControllerMotion * motion_controller,
+    gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (motion_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), "mouse-move",
-          0, event->x, event->y);
+          0, x, y);
     }
     g_object_unref (element);
   }
@@ -407,6 +472,7 @@ gtk_gst_base_widget_motion_event (GtkWidget * widget, 
   return FALSE;
 }
 
+#if !defined(BUILD_FOR_GTK4)
 static gboolean
 gtk_gst_base_widget_scroll_event (GtkWidget * widget, GdkEventScroll * event)
 {
@@ -450,8 +516,8 @@ gtk_gst_base_widget_scroll_event (GtkWidget * widget, 
   }
   return FALSE;
 }
+#endif
 
-
 void
 gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass * klass)
 {
@@ -490,24 +556,20 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass 
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+#if defined(BUILD_FOR_GTK4)
+  widget_klass->measure = gtk_gst_base_widget_measure;
+#else
   widget_klass->get_preferred_width = gtk_gst_base_widget_get_preferred_width;
   widget_klass->get_preferred_height = gtk_gst_base_widget_get_preferred_height;
-  widget_klass->key_press_event = gtk_gst_base_widget_key_event;
-  widget_klass->key_release_event = gtk_gst_base_widget_key_event;
-  widget_klass->button_press_event = gtk_gst_base_widget_button_event;
-  widget_klass->button_release_event = gtk_gst_base_widget_button_event;
-  widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event;
-  widget_klass->scroll_event = gtk_gst_base_widget_scroll_event;
+#endif
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0,
-      "Gtk Video Base Widget");
+      "GTK Video Base Widget");
 }
 
 void
 gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
 {
-  int event_mask;
-
   widget->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
   widget->par_n = DEFAULT_DISPLAY_PAR_N;
   widget->par_d = DEFAULT_DISPLAY_PAR_D;
@@ -521,20 +583,66 @@ gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
   g_weak_ref_init (&widget->element, NULL);
   g_mutex_init (&widget->lock);
 
+  widget->key_controller = gtk_event_controller_key_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->key_controller, "key-pressed",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+  g_signal_connect (widget->key_controller, "key-released",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+
+  widget->motion_controller = gtk_event_controller_motion_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->motion_controller, "motion",
+      G_CALLBACK (gtk_gst_base_widget_motion_event), NULL);
+
+  widget->click_gesture =
+#if defined(BUILD_FOR_GTK4)
+      gtk_gesture_click_new ();
+#else
+      gtk_gesture_multi_press_new (GTK_WIDGET (widget));
+#endif
+  g_signal_connect (widget->click_gesture, "pressed",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+  g_signal_connect (widget->click_gesture, "released",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+
+#if defined(BUILD_FOR_GTK4)
+  /* Otherwise widget in grid will appear as a 1x1px
+   * video which might be misleading for users */
+  gtk_widget_set_hexpand (GTK_WIDGET (widget), TRUE);
+  gtk_widget_set_vexpand (GTK_WIDGET (widget), TRUE);
+
+  gtk_widget_set_focusable (GTK_WIDGET (widget), TRUE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (widget->click_gesture),
+      GDK_BUTTON_PRIMARY);
+
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->key_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->motion_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget),
+      GTK_EVENT_CONTROLLER (widget->click_gesture));
+#endif
+
   gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE);
-  event_mask = gtk_widget_get_events (GTK_WIDGET (widget));
-  event_mask |= GDK_KEY_PRESS_MASK
-      | GDK_KEY_RELEASE_MASK
-      | GDK_BUTTON_PRESS_MASK
-      | GDK_BUTTON_RELEASE_MASK
-      | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_SCROLL_MASK;
-  gtk_widget_set_events (GTK_WIDGET (widget), event_mask);
 }
 
 void
 gtk_gst_base_widget_finalize (GObject * object)
 {
   GtkGstBaseWidget *widget = GTK_GST_BASE_WIDGET (object);
+
+  /* GTK4 takes ownership of EventControllers
+   * while GTK3 still needs manual unref */
+#if !defined(BUILD_FOR_GTK4)
+  g_object_unref (widget->key_controller);
+  g_object_unref (widget->motion_controller);
+  g_object_unref (widget->click_gesture);
+#endif
 
   gst_buffer_replace (&widget->pending_buffer, NULL);
   gst_buffer_replace (&widget->buffer, NULL);




--- ext/gtk/gtkgstbasewidget.h.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gtkgstbasewidget.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,6 +26,10 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
+#if !defined(BUILD_FOR_GTK4)
+#include <gdk/gdk.h>
+#endif
+
 #define GTK_GST_BASE_WIDGET(w)         ((GtkGstBaseWidget *)(w))
 #define GTK_GST_BASE_WIDGET_CLASS(k)   ((GtkGstBaseWidgetClass *)(k))
 #define GTK_GST_BASE_WIDGET_LOCK(w)    g_mutex_lock(&((GtkGstBaseWidget*)(w))->lock)
@@ -39,9 +44,7 @@ struct _GtkGstBaseWidget
 {
   union {
     GtkDrawingArea drawing_area;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLArea gl_area;
-#endif
   } parent;
 
   /* properties */
@@ -68,6 +71,11 @@ struct _GtkGstBaseWidget
   GMutex lock;
   GWeakRef element;
 
+  /* event controllers */
+  GtkEventController *key_controller;
+  GtkEventController *motion_controller;
+  GtkGesture *click_gesture;
+
   /* Pending draw idles callback */
   guint draw_id;
 };
@@ -76,9 +84,7 @@ struct _GtkGstBaseWidgetClass
 {
   union {
     GtkDrawingAreaClass drawing_area_class;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLAreaClass gl_area_class;
-#endif
   } parent_class;
 };
 




--- ext/gtk/gtkgstglwidget.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gtkgstglwidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,12 +31,20 @@
 #include <gst/video/video.h>
 
 #if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/x11/gdkx.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #include <gst/gl/x11/gstgldisplay_x11.h>
 #endif
 
 #if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
+#endif
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
@@ -81,8 +90,7 @@ static const GLfloat vertices[] = {
 G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
     G_ADD_PRIVATE (GtkGstGLWidget)
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
-        "Gtk Gst GL Widget");
-    );
+        "GTK Gst GL Widget"));
 
 static void
 gtk_gst_gl_widget_bind_buffer (GtkGstGLWidget * gst_widget)
@@ -510,8 +518,11 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)
 
   GST_INFO ("Created %" GST_PTR_FORMAT, priv->display);
 
+  /* GTK4 always has alpha */
+#if !defined(BUILD_FOR_GTK4)
   gtk_gl_area_set_has_alpha (GTK_GL_AREA (gst_widget),
       !base_widget->ignore_alpha);
+#endif
 }
 
 static void




--- ext/gtk/gtkgstwidget.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gtkgstwidget.c
@@ -38,17 +38,15 @@
 
 G_DEFINE_TYPE (GtkGstWidget, gtk_gst_widget, GTK_TYPE_DRAWING_AREA);
 
-static gboolean
-gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+static void
+_drawing_area_draw (GtkDrawingArea * da, cairo_t * cr,
+    gint widget_width, gint widget_height, gpointer data)
 {
+  GtkWidget *widget = GTK_WIDGET (da);
   GtkGstBaseWidget *gst_widget = (GtkGstBaseWidget *) widget;
-  guint widget_width, widget_height;
   cairo_surface_t *surface;
   GstVideoFrame frame;
 
-  widget_width = gtk_widget_get_allocated_width (widget);
-  widget_height = gtk_widget_get_allocated_height (widget);
-
   GTK_GST_BASE_WIDGET_LOCK (gst_widget);
 
   /* There is not much to optimize in term of redisplay, so simply swap the
@@ -148,7 +146,10 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       color.alpha = 1.0;
     } else {
       gtk_style_context_get_color (gtk_widget_get_style_context (widget),
-          GTK_STATE_FLAG_NORMAL, &color);
+#if !defined(BUILD_FOR_GTK4)
+          GTK_STATE_FLAG_NORMAL,
+#endif
+          &color);
     }
     gdk_cairo_set_source_rgba (cr, &color);
     cairo_rectangle (cr, 0, 0, widget_width, widget_height);
@@ -156,8 +157,20 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   }
 
   GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
+}
+
+#if !defined(BUILD_FOR_GTK4)
+static gboolean
+gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+{
+  gint width = gtk_widget_get_allocated_width (widget);
+  gint height = gtk_widget_get_allocated_height (widget);
+
+  _drawing_area_draw (GTK_DRAWING_AREA (widget), cr, width, height, NULL);
+
   return FALSE;
 }
+#endif
 
 static void
 gtk_gst_widget_finalize (GObject * object)
@@ -171,17 +184,25 @@ static void
 gtk_gst_widget_class_init (GtkGstWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
+#if !defined(BUILD_FOR_GTK4)
   GtkWidgetClass *widget_klass = (GtkWidgetClass *) klass;
+#endif
 
   gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
   gobject_klass->finalize = gtk_gst_widget_finalize;
+#if !defined(BUILD_FOR_GTK4)
   widget_klass->draw = gtk_gst_widget_draw;
+#endif
 }
 
 static void
 gtk_gst_widget_init (GtkGstWidget * widget)
 {
   gtk_gst_base_widget_init (GTK_GST_BASE_WIDGET (widget));
+#if defined(BUILD_FOR_GTK4)
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (widget),
+      _drawing_area_draw, NULL, NULL);
+#endif
 }
 
 GtkWidget *




--- ext/gtk/meson.build.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/meson.build
@@ -1,3 +1,4 @@
+gtk_versions = [3, 4]
 gtk_sources = [
   'gstgtkbasesink.c',
   'gstgtksink.c',
@@ -6,54 +7,88 @@ gtk_sources = [
   'gtkgstbasewidget.c',
   'gtkgstwidget.c',
 ]
+gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
+gtk_optional_deps = []
 
-gtk_defines = []
-optional_deps = []
+gtk4_dep = dependency('gtk4', required : get_option('gtk4'))
+gtk4_optional_deps = []
 
-gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-if gtk_dep.found()
-  # FIXME: automagic
-  if have_gstgl and gtk_dep.version().version_compare('>=3.15.0')
-    have_gtk3_gl_windowing = false
+foreach gtk_ver : gtk_versions
+  gtkv = 'gtk' + gtk_ver.to_string()
 
+  gtk_state = get_option(gtkv)
+  if gtk_state.disabled()
+    continue
+  endif
+
+  min_ver = gtk_ver >= 4 ? '3.99.2'          : '3.24.0'
+  x11_str = gtk_ver >= 4 ? gtkv + '-x11'     : 'gtk+-x11-3.0'
+  way_str = gtk_ver >= 4 ? gtkv + '-wayland' : 'gtk+-wayland-3.0'
+  lib_dep = gtk_ver >= 4 ? gtk4_dep          : gtk_dep
+
+  if not lib_dep.found() or not lib_dep.version().version_compare('>=' + min_ver)
+    continue
+  endif
+
+  lib_sources = []
+  gtk_defines = []
+  optional_deps = []
+  have_gtk_gl_windowing = false
+
+  lib_sources += gtk_sources
+
+  if have_gstgl
     if gst_gl_have_window_x11 and gst_gl_have_platform_glx
       # FIXME: automagic
-      gtk_x11_dep = dependency('gtk+-x11-3.0', required : false)
+      gtk_x11_dep = dependency(x11_str, required : false)
       if gtk_x11_dep.found()
         optional_deps += [gtk_x11_dep, gstglx11_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
 
     if gst_gl_have_window_wayland and gst_gl_have_platform_egl
       # FIXME: automagic
-      gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : false)
+      gtk_wayland_dep = dependency(way_str, required : false)
       if gtk_wayland_dep.found()
         optional_deps += [gtk_wayland_dep, gstglegl_dep, gstglwayland_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
+  endif
 
-    if have_gtk3_gl_windowing
-      gtk_sources += [
-        'gstgtkglsink.c',
-        'gtkgstglwidget.c',
-      ]
-      optional_deps += [gstgl_dep, gstglproto_dep]
-      gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK3_GL']
-    endif
+  if have_gtk_gl_windowing
+    lib_sources += [
+      'gstgtkglsink.c',
+      'gtkgstglwidget.c',
+    ]
+    optional_deps += gstgl_dep
+    optional_deps += gstglproto_dep
+    gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK_GL']
   endif
 
-  gstgtk = library('gstgtk',
-    gtk_sources,
+  if gtk_ver == 3
+    gtk_optional_deps = optional_deps
+  elif gtk_ver == 4
+    gtk4_optional_deps = optional_deps
+    gtk_defines += '-DBUILD_FOR_GTK4'
+  endif
+
+  lib_name = 'gstgtk'
+  if gtk_ver > 3
+    lib_name += gtk_ver.to_string()
+  endif
+
+  gstgtk = library(lib_name,
+    lib_sources,
     c_args : gst_plugins_good_args + gtk_defines,
     link_args : noseh_link_args,
     include_directories : [configinc],
-    dependencies : [gtk_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
+    dependencies : [lib_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
     install : true,
     install_dir : plugins_install_dir,
   )
   pkgconfig.generate(gstgtk, install_dir : plugins_pkgconfig_install_dir)
   plugins += [gstgtk]
-endif
+endforeach
 




https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767

--- ext/gtk/gstgtkbasesink.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstgtkbasesink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -77,7 +78,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstGtkBaseSink, gst_
     G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
         gst_gtk_base_sink_navigation_interface_init);
     GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_sink,
-        "gtkbasesink", 0, "Gtk Video Sink base class"));
+        "gtkbasesink", 0, "GTK Video Sink base class"));
 
 
 static void
@@ -97,7 +98,7 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
   gobject_class->get_property = gst_gtk_base_sink_get_property;
 
   g_object_class_install_property (gobject_class, PROP_WIDGET,
-      g_param_spec_object ("widget", "Gtk Widget",
+      g_param_spec_object ("widget", "GTK Widget",
           "The GtkWidget to place in the widget hierarchy "
           "(must only be get from the GTK main thread)",
           GTK_TYPE_WIDGET, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
@@ -114,10 +115,13 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
           "The pixel aspect ratio of the device", DEFAULT_PAR_N, DEFAULT_PAR_D,
           G_MAXINT, 1, 1, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /* Disabling alpha was removed in GTK4 */
+#if !defined(BUILD_FOR_GTK4)
   g_object_class_install_property (gobject_class, PROP_IGNORE_ALPHA,
       g_param_spec_boolean ("ignore-alpha", "Ignore Alpha",
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
 
   gobject_class->finalize = gst_gtk_base_sink_finalize;
 
@@ -144,6 +148,8 @@ gst_gtk_base_sink_finalize (GObject * object)
 {
   GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);
 
+  GST_DEBUG ("finalizing base sink");
+
   GST_OBJECT_LOCK (gtk_sink);
   if (gtk_sink->window && gtk_sink->window_destroy_id)
     g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id);
@@ -168,6 +174,14 @@ static void
 window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
 {
   GST_OBJECT_LOCK (gtk_sink);
+  if (gtk_sink->widget) {
+    if (gtk_sink->widget_destroy_id) {
+      g_signal_handler_disconnect (gtk_sink->widget,
+          gtk_sink->widget_destroy_id);
+      gtk_sink->widget_destroy_id = 0;
+    }
+    g_clear_object (&gtk_sink->widget);
+  }
   gtk_sink->window = NULL;
   GST_OBJECT_UNLOCK (gtk_sink);
 }
@@ -180,7 +194,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
 
   /* Ensure GTK is initialized, this has no side effect if it was already
    * initialized. Also, we do that lazily, so the application can be first */
-  if (!gtk_init_check (NULL, NULL)) {
+  if (!gtk_init_check (
+#if !defined(BUILD_FOR_GTK4)
+          NULL, NULL
+#endif
+      )) {
     GST_ERROR_OBJECT (gtk_sink, "Could not ensure GTK initialization.");
     return NULL;
   }
@@ -195,13 +213,16 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
   gtk_sink->bind_pixel_aspect_ratio =
       g_object_bind_property (gtk_sink, "pixel-aspect-ratio", gtk_sink->widget,
       "pixel-aspect-ratio", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#if !defined(BUILD_FOR_GTK4)
   gtk_sink->bind_ignore_alpha =
       g_object_bind_property (gtk_sink, "ignore-alpha", gtk_sink->widget,
       "ignore-alpha", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#endif
 
   /* Take the floating ref, other wise the destruction of the container will
    * make this widget disapear possibly before we are done. */
   gst_object_ref_sink (gtk_sink->widget);
+
   gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy",
       G_CALLBACK (widget_destroy_cb), gtk_sink);
 
@@ -311,25 +332,55 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
   GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink);
   GtkWidget *toplevel;
+#if defined(BUILD_FOR_GTK4)
+  GtkRoot *root;
+#endif
 
   if (gst_gtk_base_sink_get_widget (gst_sink) == NULL)
     return FALSE;
 
   /* After this point, gtk_sink->widget will always be set */
 
+#if defined(BUILD_FOR_GTK4)
+  root = gtk_widget_get_root (GTK_WIDGET (gst_sink->widget));
+  if (!GTK_IS_ROOT (root)) {
+    GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gst_sink->widget));
+    if (parent) {
+      GtkWidget *temp_parent;
+      while ((temp_parent = gtk_widget_get_parent (parent)))
+        parent = temp_parent;
+    }
+    toplevel = (parent) ? parent : GTK_WIDGET (gst_sink->widget);
+#else
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gst_sink->widget));
   if (!gtk_widget_is_toplevel (toplevel)) {
+#endif
     /* sanity check */
     g_assert (klass->window_title);
 
     /* User did not add widget its own UI, let's popup a new GtkWindow to
      * make gst-launch-1.0 work. */
-    gst_sink->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gst_sink->window = gtk_window_new (
+#if !defined(BUILD_FOR_GTK4)
+        GTK_WINDOW_TOPLEVEL
+#endif
+        );
     gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
     gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
-    gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
-    gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy",
-        G_CALLBACK (window_destroy_cb), gst_sink);
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_set_child (GTK_WINDOW (
+#else
+    gtk_container_add (GTK_CONTAINER (
+#endif
+            gst_sink->window), toplevel);
+
+    gst_sink->window_destroy_id = g_signal_connect (
+#if defined(BUILD_FOR_GTK4)
+        GTK_WINDOW (gst_sink->window),
+#else
+        gst_sink->window,
+#endif
+        "destroy", G_CALLBACK (window_destroy_cb), gst_sink);
   }
 
   return TRUE;
@@ -348,7 +399,11 @@ gst_gtk_base_sink_stop_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
 
   if (gst_sink->window) {
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_destroy (GTK_WINDOW (gst_sink->window));
+#else
     gtk_widget_destroy (gst_sink->window);
+#endif
     gst_sink->window = NULL;
     gst_sink->widget = NULL;
   }
@@ -369,10 +424,14 @@ gst_gtk_base_sink_stop (GstBaseSink * bsink)
 }
 
 static void
-gst_gtk_widget_show_all_and_unref (GtkWidget * widget)
+gst_gtk_window_show_all_and_unref (GtkWidget * window)
 {
-  gtk_widget_show_all (widget);
-  g_object_unref (widget);
+#if defined(BUILD_FOR_GTK4)
+  gtk_window_present (GTK_WINDOW (window));
+#else
+  gtk_widget_show_all (window);
+#endif
+  g_object_unref (window);
 }
 
 static GstStateChangeReturn
@@ -400,7 +459,7 @@ gst_gtk_base_sink_change_state (GstElement * element, 
       GST_OBJECT_UNLOCK (gtk_sink);
 
       if (window)
-        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_widget_show_all_and_unref,
+        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_window_show_all_and_unref,
             window);
 
       break;
--- ext/gtk/gstgtkbasesink.h.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstgtkbasesink.h
@@ -51,14 +51,14 @@ GType gst_gtk_base_sink_get_type (void);
 struct _GstGtkBaseSink
 {
   /* <private> */
-  GstVideoSink         parent;
+  GstVideoSink          parent;
 
-  GstVideoInfo         v_info;
+  GstVideoInfo          v_info;
 
   GtkGstBaseWidget     *widget;
 
   /* properties */
-  gboolean             force_aspect_ratio;
+  gboolean              force_aspect_ratio;
   GBinding             *bind_aspect_ratio;
 
   gint                  par_n;
@@ -69,8 +69,8 @@ struct _GstGtkBaseSink
   GBinding             *bind_ignore_alpha;
 
   GtkWidget            *window;
-  gulong               widget_destroy_id;
-  gulong               window_destroy_id;
+  gulong                widget_destroy_id;
+  gulong                window_destroy_id;
 };
 
 /**
--- ext/gtk/gstgtkglsink.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstgtkglsink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,12 +24,18 @@
  * @title: gtkglsink
  */
 
+/**
+ * SECTION:element-gtk4glsink
+ * @title: gtk4glsink
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <gst/gl/gstglfuncs.h>
 
+#include "gtkconfig.h"
 #include "gstgtkglsink.h"
 #include "gtkgstglwidget.h"
 
@@ -58,7 +65,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template =
 #define gst_gtk_gl_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,
     GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink,
-        "gtkglsink", 0, "Gtk GL Video Sink"));
+        GTKCONFIG_GLSINK, 0, GTKCONFIG_NAME " GL Video Sink"));
 
 static void
 gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
@@ -82,11 +89,13 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
   gstbasesink_class->get_caps = gst_gtk_gl_sink_get_caps;
 
   gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new;
-  gstgtkbasesink_class->window_title = "Gtk+ GL renderer";
+  gstgtkbasesink_class->window_title = GTKCONFIG_NAME " GL Renderer";
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " GL Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL",
-      "Matthew Waters <matthew@centricular.com>");
+      "Matthew Waters <matthew@centricular.com>, "
+      "Rafał Dzięgiel <rafostar.github@gmail.com>");
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_gtk_gl_sink_template);
@@ -120,16 +129,18 @@ gst_gtk_gl_sink_query (GstBaseSink * bsink, GstQuery *
 }
 
 static void
-_size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle,
-    GstGtkGLSink * gtk_sink)
+_size_changed_cb (GtkWidget * widget, gint width,
+    gint height, GstGtkGLSink * gtk_sink)
 {
-  gint scale_factor, width, height;
   gboolean reconfigure;
 
-  scale_factor = gtk_widget_get_scale_factor (widget);
-  width = scale_factor * gtk_widget_get_allocated_width (widget);
-  height = scale_factor * gtk_widget_get_allocated_height (widget);
+  GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
 
+  /* Ignore size changes before widget is negotiated
+   * we are going to queue a resize after negotiation */
+  if (!base_widget->negotiated)
+    return;
+
   GST_OBJECT_LOCK (gtk_sink);
   reconfigure =
       (width != gtk_sink->display_width || height != gtk_sink->display_height);
@@ -138,7 +149,7 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
   GST_OBJECT_UNLOCK (gtk_sink);
 
   if (reconfigure) {
-    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad.");
+    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad");
     gst_pad_push_event (GST_BASE_SINK (gtk_sink)->sinkpad,
         gst_event_new_reconfigure ());
   }
@@ -147,9 +158,9 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
 static void
 destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink)
 {
-  if (gtk_sink->size_allocate_sig_handler) {
-    g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (widget, gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {
@@ -172,29 +183,34 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink)
   gst_widget = GTK_GST_GL_WIDGET (base_sink->widget);
 
   /* Track the allocation size */
-  gtk_sink->size_allocate_sig_handler =
-      g_signal_connect (gst_widget, "size-allocate",
-      G_CALLBACK (_size_changed_cb), gtk_sink);
+  if (!gtk_sink->widget_resize_sig_handler) {
+    gtk_sink->widget_resize_sig_handler =
+        g_signal_connect (gst_widget, "resize",
+        G_CALLBACK (_size_changed_cb), gtk_sink);
+  }
 
-  gtk_sink->widget_destroy_sig_handler =
-      g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
-      gtk_sink);
+  if (!gtk_sink->widget_destroy_sig_handler) {
+    gtk_sink->widget_destroy_sig_handler =
+        g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
+        gtk_sink);
+  }
 
-  _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink);
-
   if (!gtk_gst_gl_widget_init_winsys (gst_widget)) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to initialize OpenGL with Gtk"), (NULL));
+            "Failed to initialize OpenGL with GTK"), (NULL));
     return FALSE;
   }
 
-  gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
-  gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
-  gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
+  if (!gtk_sink->display)
+    gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
+  if (!gtk_sink->context)
+    gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
+  if (!gtk_sink->gtk_context)
+    gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
 
   if (!gtk_sink->display || !gtk_sink->context || !gtk_sink->gtk_context) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to retrieve OpenGL context from Gtk"), (NULL));
+            "Failed to retrieve OpenGL context from GTK"), (NULL));
     return FALSE;
   }
 
@@ -208,7 +224,14 @@ static gboolean
 gst_gtk_gl_sink_stop (GstBaseSink * bsink)
 {
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (bsink);
+  GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (bsink);
 
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (base_sink->widget,
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
+  }
+
   if (gtk_sink->display) {
     gst_object_unref (gtk_sink->display);
     gtk_sink->display = NULL;
@@ -348,10 +371,10 @@ gst_gtk_gl_sink_finalize (GObject * object)
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object);
   GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object);
 
-  if (gtk_sink->size_allocate_sig_handler) {
+  if (gtk_sink->widget_resize_sig_handler) {
     g_signal_handler_disconnect (base_sink->widget,
-        gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {
--- ext/gtk/gstgtkglsink.h.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstgtkglsink.h
@@ -65,7 +65,7 @@ struct _GstGtkGLSink
   gint                  display_width;
   gint                  display_height;
 
-  gulong                size_allocate_sig_handler;
+  gulong                widget_resize_sig_handler;
   gulong                widget_destroy_sig_handler;
 };
 
--- ext/gtk/gstgtksink.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstgtksink.c
@@ -19,15 +19,22 @@
  */
 
 /**
- * SECTION:element-gtkgstsink
- * @title: gtkgstsink
+ * SECTION:element-gtksink
+ * @title: gtksink
  *
  */
 
+/**
+ * SECTION:element-gtk4sink
+ * @title: gtk4sink
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gtkgstwidget.h"
 #include "gstgtksink.h"
 
@@ -49,8 +56,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
 
 #define gst_gtk_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkSink, gst_gtk_sink, GST_TYPE_GTK_BASE_SINK,
-    GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, "gtksink", 0,
-        "Gtk Video Sink"));
+    GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, GTKCONFIG_SINK, 0,
+        GTKCONFIG_NAME " Video Sink"));
 
 static void
 gst_gtk_sink_class_init (GstGtkSinkClass * klass)
@@ -62,9 +69,10 @@ gst_gtk_sink_class_init (GstGtkSinkClass * klass)
   base_class = (GstGtkBaseSinkClass *) klass;
 
   base_class->create_widget = gtk_gst_widget_new;
-  base_class->window_title = "Gtk+ Cairo renderer";
+  base_class->window_title = GTKCONFIG_NAME " Cairo Renderer";
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget",
       "Matthew Waters <matthew@centricular.com>");
 
--- ext/gtk/gstplugin.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gstplugin.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -22,31 +23,31 @@
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gstgtksink.h"
-#if defined(HAVE_GTK3_GL)
+
+#if defined(HAVE_GTK_GL)
 #include "gstgtkglsink.h"
 #endif
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "gtksink",
+  if (!gst_element_register (plugin, GTKCONFIG_SINK,
           GST_RANK_NONE, GST_TYPE_GTK_SINK)) {
     return FALSE;
   }
-#if defined(HAVE_GTK3_GL)
-  if (!gst_element_register (plugin, "gtkglsink",
+#if defined(HAVE_GTK_GL)
+  if (!gst_element_register (plugin, GTKCONFIG_GLSINK,
           GST_RANK_NONE, GST_TYPE_GTK_GL_SINK)) {
     return FALSE;
   }
 #endif
-
   return TRUE;
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gtk,
-    "Gtk+ sink",
+    GTKCONFIG_PLUGIN, GTKCONFIG_NAME " sink",
     plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)
--- ext/gtk/gtkconfig.h.orig	2021-08-23 11:11:05 UTC
+++ ext/gtk/gtkconfig.h
@@ -0,0 +1,31 @@
+/*
+ * GStreamer
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if defined(BUILD_FOR_GTK4)
+#define GTKCONFIG_PLUGIN gtk4
+#define GTKCONFIG_NAME "GTK4"
+#define GTKCONFIG_SINK "gtk4sink"
+#define GTKCONFIG_GLSINK "gtk4glsink"
+#else
+#define GTKCONFIG_PLUGIN gtk
+#define GTKCONFIG_NAME "GTK"
+#define GTKCONFIG_SINK "gtksink"
+#define GTKCONFIG_GLSINK "gtkglsink"
+#endif
--- ext/gtk/gtkgstbasewidget.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gtkgstbasewidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -74,7 +75,23 @@ gtk_gst_base_widget_get_preferred_height (GtkWidget * 
     *natural = video_height;
 }
 
+#if defined(BUILD_FOR_GTK4)
 static void
+gtk_gst_base_widget_measure (GtkWidget * widget, GtkOrientation orientation,
+    gint for_size, gint * min, gint * natural,
+    gint * minimum_baseline, gint * natural_baseline)
+{
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    gtk_gst_base_widget_get_preferred_width (widget, min, natural);
+  else
+    gtk_gst_base_widget_get_preferred_height (widget, min, natural);
+
+  *minimum_baseline = -1;
+  *natural_baseline = -1;
+}
+#endif
+
+static void
 gtk_gst_base_widget_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -235,22 +252,46 @@ _gdk_key_to_navigation_string (guint keyval)
   }
 }
 
+static GdkEvent *
+_get_current_event (GtkEventController * controller)
+{
+#if defined(BUILD_FOR_GTK4)
+  return gtk_event_controller_get_current_event (controller);
+#else
+  return gtk_get_current_event ();
+#endif
+}
+
+static void
+_gdk_event_free (GdkEvent * event)
+{
+#if !defined(BUILD_FOR_GTK4)
+  if (event)
+    gdk_event_free (event);
+#endif
+}
+
 static gboolean
-gtk_gst_base_widget_key_event (GtkWidget * widget, GdkEventKey * event)
+gtk_gst_base_widget_key_event (GtkEventControllerKey * key_controller,
+    guint keyval, guint keycode, GdkModifierType state)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (key_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
-      const gchar *str = _gdk_key_to_navigation_string (event->keyval);
-      const gchar *key_type =
-          event->type == GDK_KEY_PRESS ? "key-press" : "key-release";
+      GdkEvent *event = _get_current_event (controller);
+      const gchar *str = _gdk_key_to_navigation_string (keyval);
 
-      if (!str)
-        str = event->string;
-
-      gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      if (str) {
+        const gchar *key_type =
+            gdk_event_get_event_type (event) ==
+            GDK_KEY_PRESS ? "key-press" : "key-release";
+        gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      }
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -325,22 +366,43 @@ _display_size_to_stream_size (GtkGstBaseWidget * base_
 }
 
 static gboolean
-gtk_gst_base_widget_button_event (GtkWidget * widget, GdkEventButton * event)
+gtk_gst_base_widget_button_event (
+#if defined(BUILD_FOR_GTK4)
+    GtkGestureClick * gesture,
+#else
+    GtkGestureMultiPress * gesture,
+#endif
+    gint n_press, gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (gesture);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
+      GdkEvent *event = _get_current_event (controller);
       const gchar *key_type =
-          event->type ==
-          GDK_BUTTON_PRESS ? "mouse-button-press" : "mouse-button-release";
-      gdouble x, y;
+          gdk_event_get_event_type (event) == GDK_BUTTON_PRESS
+          ? "mouse-button-press" : "mouse-button-release";
+      gdouble stream_x, stream_y;
+#if !defined(BUILD_FOR_GTK4)
+      guint button;
+      gdk_event_get_button (event, &button);
+#endif
 
-      _display_size_to_stream_size (base_widget, event->x, event->y, &x, &y);
+      _display_size_to_stream_size (base_widget, x, y, &stream_x, &stream_y);
 
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), key_type,
-          event->button, x, y);
+#if defined(BUILD_FOR_GTK4)
+          /* Gesture is set to ignore other buttons so we do not have to check */
+          GDK_BUTTON_PRIMARY,
+#else
+          button,
+#endif
+          stream_x, stream_y);
+
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -349,19 +411,22 @@ gtk_gst_base_widget_button_event (GtkWidget * widget, 
 }
 
 static gboolean
-gtk_gst_base_widget_motion_event (GtkWidget * widget, GdkEventMotion * event)
+gtk_gst_base_widget_motion_event (GtkEventControllerMotion * motion_controller,
+    gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (motion_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
-      gdouble x, y;
+      gdouble stream_x, stream_y;
 
-      _display_size_to_stream_size (base_widget, event->x, event->y, &x, &y);
+      _display_size_to_stream_size (base_widget, x, y, &stream_x, &stream_y);
 
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), "mouse-move",
-          0, x, y);
+          0, stream_x, stream_y);
     }
     g_object_unref (element);
   }
@@ -395,23 +460,20 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass 
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+#if defined(BUILD_FOR_GTK4)
+  widget_klass->measure = gtk_gst_base_widget_measure;
+#else
   widget_klass->get_preferred_width = gtk_gst_base_widget_get_preferred_width;
   widget_klass->get_preferred_height = gtk_gst_base_widget_get_preferred_height;
-  widget_klass->key_press_event = gtk_gst_base_widget_key_event;
-  widget_klass->key_release_event = gtk_gst_base_widget_key_event;
-  widget_klass->button_press_event = gtk_gst_base_widget_button_event;
-  widget_klass->button_release_event = gtk_gst_base_widget_button_event;
-  widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event;
+#endif
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0,
-      "Gtk Video Base Widget");
+      "GTK Video Base Widget");
 }
 
 void
 gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
 {
-  int event_mask;
-
   widget->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
   widget->par_n = DEFAULT_PAR_N;
   widget->par_d = DEFAULT_PAR_D;
@@ -423,20 +485,66 @@ gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
   g_weak_ref_init (&widget->element, NULL);
   g_mutex_init (&widget->lock);
 
+  widget->key_controller = gtk_event_controller_key_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->key_controller, "key-pressed",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+  g_signal_connect (widget->key_controller, "key-released",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+
+  widget->motion_controller = gtk_event_controller_motion_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->motion_controller, "motion",
+      G_CALLBACK (gtk_gst_base_widget_motion_event), NULL);
+
+  widget->click_gesture =
+#if defined(BUILD_FOR_GTK4)
+      gtk_gesture_click_new ();
+#else
+      gtk_gesture_multi_press_new (GTK_WIDGET (widget));
+#endif
+  g_signal_connect (widget->click_gesture, "pressed",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+  g_signal_connect (widget->click_gesture, "released",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+
+#if defined(BUILD_FOR_GTK4)
+  /* Otherwise widget in grid will appear as a 1x1px
+   * video which might be misleading for users */
+  gtk_widget_set_hexpand (GTK_WIDGET (widget), TRUE);
+  gtk_widget_set_vexpand (GTK_WIDGET (widget), TRUE);
+
+  gtk_widget_set_focusable (GTK_WIDGET (widget), TRUE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (widget->click_gesture),
+      GDK_BUTTON_PRIMARY);
+
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->key_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->motion_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget),
+      GTK_EVENT_CONTROLLER (widget->click_gesture));
+#endif
+
   gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE);
-  event_mask = gtk_widget_get_events (GTK_WIDGET (widget));
-  event_mask |= GDK_KEY_PRESS_MASK
-      | GDK_KEY_RELEASE_MASK
-      | GDK_BUTTON_PRESS_MASK
-      | GDK_BUTTON_RELEASE_MASK
-      | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK;
-  gtk_widget_set_events (GTK_WIDGET (widget), event_mask);
 }
 
 void
 gtk_gst_base_widget_finalize (GObject * object)
 {
   GtkGstBaseWidget *widget = GTK_GST_BASE_WIDGET (object);
+
+  /* GTK4 takes ownership of EventControllers
+   * while GTK3 still needs manual unref */
+#if !defined(BUILD_FOR_GTK4)
+  g_object_unref (widget->key_controller);
+  g_object_unref (widget->motion_controller);
+  g_object_unref (widget->click_gesture);
+#endif
 
   gst_buffer_replace (&widget->pending_buffer, NULL);
   gst_buffer_replace (&widget->buffer, NULL);
--- ext/gtk/gtkgstbasewidget.h.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gtkgstbasewidget.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,6 +26,10 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
+#if !defined(BUILD_FOR_GTK4)
+#include <gdk/gdk.h>
+#endif
+
 #define GTK_GST_BASE_WIDGET(w)         ((GtkGstBaseWidget *)(w))
 #define GTK_GST_BASE_WIDGET_CLASS(k)   ((GtkGstBaseWidgetClass *)(k))
 #define GTK_GST_BASE_WIDGET_LOCK(w)    g_mutex_lock(&((GtkGstBaseWidget*)(w))->lock)
@@ -39,9 +44,7 @@ struct _GtkGstBaseWidget
 {
   union {
     GtkDrawingArea drawing_area;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLArea gl_area;
-#endif
   } parent;
 
   /* properties */
@@ -67,6 +70,11 @@ struct _GtkGstBaseWidget
   GMutex lock;
   GWeakRef element;
 
+  /* event controllers */
+  GtkEventController *key_controller;
+  GtkEventController *motion_controller;
+  GtkGesture *click_gesture;
+
   /* Pending draw idles callback */
   guint draw_id;
 };
@@ -75,9 +83,7 @@ struct _GtkGstBaseWidgetClass
 {
   union {
     GtkDrawingAreaClass drawing_area_class;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLAreaClass gl_area_class;
-#endif
   } parent_class;
 };
 
--- ext/gtk/gtkgstglwidget.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gtkgstglwidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,12 +31,20 @@
 #include <gst/video/video.h>
 
 #if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/x11/gdkx.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #include <gst/gl/x11/gstgldisplay_x11.h>
 #endif
 
 #if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
+#endif
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
@@ -78,8 +87,7 @@ static const GLfloat vertices[] = {
 G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
     G_ADD_PRIVATE (GtkGstGLWidget)
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
-        "Gtk Gst GL Widget");
-    );
+        "GTK Gst GL Widget"));
 
 static void
 gtk_gst_gl_widget_bind_buffer (GtkGstGLWidget * gst_widget)
@@ -407,8 +415,11 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)
 
   GST_INFO ("Created %" GST_PTR_FORMAT, priv->display);
 
+  /* GTK4 always has alpha */
+#if !defined(BUILD_FOR_GTK4)
   gtk_gl_area_set_has_alpha (GTK_GL_AREA (gst_widget),
       !base_widget->ignore_alpha);
+#endif
 }
 
 static void
--- ext/gtk/gtkgstwidget.c.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/gtkgstwidget.c
@@ -38,17 +38,15 @@
 
 G_DEFINE_TYPE (GtkGstWidget, gtk_gst_widget, GTK_TYPE_DRAWING_AREA);
 
-static gboolean
-gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+static void
+_drawing_area_draw (GtkDrawingArea * da, cairo_t * cr,
+    gint widget_width, gint widget_height, gpointer data)
 {
+  GtkWidget *widget = GTK_WIDGET (da);
   GtkGstBaseWidget *gst_widget = (GtkGstBaseWidget *) widget;
-  guint widget_width, widget_height;
   cairo_surface_t *surface;
   GstVideoFrame frame;
 
-  widget_width = gtk_widget_get_allocated_width (widget);
-  widget_height = gtk_widget_get_allocated_height (widget);
-
   GTK_GST_BASE_WIDGET_LOCK (gst_widget);
 
   /* There is not much to optimize in term of redisplay, so simply swap the
@@ -148,7 +146,10 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       color.alpha = 1.0;
     } else {
       gtk_style_context_get_color (gtk_widget_get_style_context (widget),
-          GTK_STATE_FLAG_NORMAL, &color);
+#if !defined(BUILD_FOR_GTK4)
+          GTK_STATE_FLAG_NORMAL,
+#endif
+          &color);
     }
     gdk_cairo_set_source_rgba (cr, &color);
     cairo_rectangle (cr, 0, 0, widget_width, widget_height);
@@ -156,8 +157,20 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   }
 
   GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
+}
+
+#if !defined(BUILD_FOR_GTK4)
+static gboolean
+gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+{
+  gint width = gtk_widget_get_allocated_width (widget);
+  gint height = gtk_widget_get_allocated_height (widget);
+
+  _drawing_area_draw (GTK_DRAWING_AREA (widget), cr, width, height, NULL);
+
   return FALSE;
 }
+#endif
 
 static void
 gtk_gst_widget_finalize (GObject * object)
@@ -171,17 +184,25 @@ static void
 gtk_gst_widget_class_init (GtkGstWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
+#if !defined(BUILD_FOR_GTK4)
   GtkWidgetClass *widget_klass = (GtkWidgetClass *) klass;
+#endif
 
   gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
   gobject_klass->finalize = gtk_gst_widget_finalize;
+#if !defined(BUILD_FOR_GTK4)
   widget_klass->draw = gtk_gst_widget_draw;
+#endif
 }
 
 static void
 gtk_gst_widget_init (GtkGstWidget * widget)
 {
   gtk_gst_base_widget_init (GTK_GST_BASE_WIDGET (widget));
+#if defined(BUILD_FOR_GTK4)
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (widget),
+      _drawing_area_draw, NULL, NULL);
+#endif
 }
 
 GtkWidget *
--- ext/gtk/meson.build.orig	2019-12-03 11:06:37 UTC
+++ ext/gtk/meson.build
@@ -1,3 +1,4 @@
+gtk_versions = [3, 4]
 gtk_sources = [
   'gstgtkbasesink.c',
   'gstgtksink.c',
@@ -6,52 +7,86 @@ gtk_sources = [
   'gtkgstbasewidget.c',
   'gtkgstwidget.c',
 ]
+gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
+gtk_optional_deps = []
 
-gtk_defines = []
-optional_deps = []
+gtk4_dep = dependency('gtk4', required : get_option('gtk4'))
+gtk4_optional_deps = []
 
-gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-if gtk_dep.found()
-  if build_gstgl and gstgl_dep.found() and gtk_dep.version().version_compare('>=3.15.0')
-    have_gtk3_gl_windowing = false
+foreach gtk_ver : gtk_versions
+  gtkv = 'gtk' + gtk_ver.to_string()
 
+  gtk_state = get_option(gtkv)
+  if gtk_state.disabled()
+    continue
+  endif
+
+  min_ver = gtk_ver >= 4 ? '3.99.2'          : '3.24.0'
+  x11_str = gtk_ver >= 4 ? gtkv + '-x11'     : 'gtk+-x11-3.0'
+  way_str = gtk_ver >= 4 ? gtkv + '-wayland' : 'gtk+-wayland-3.0'
+  lib_dep = gtk_ver >= 4 ? gtk4_dep          : gtk_dep
+
+  if not lib_dep.found() or not lib_dep.version().version_compare('>=' + min_ver)
+    continue
+  endif
+
+  lib_sources = []
+  gtk_defines = []
+  optional_deps = []
+  have_gtk_gl_windowing = false
+
+  lib_sources += gtk_sources
+
+  if build_gstgl
     if gst_gl_have_window_x11 and gst_gl_have_platform_glx
       # FIXME: automagic
-      gtk_x11_dep = dependency('gtk+-x11-3.0', required : false)
+      gtk_x11_dep = dependency(x11_str, required : false)
       if gtk_x11_dep.found()
         optional_deps += gtk_x11_dep
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
 
     if gst_gl_have_window_wayland and gst_gl_have_platform_egl
       # FIXME: automagic
-      gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : false)
+      gtk_wayland_dep = dependency(way_str, required : false)
       if gtk_wayland_dep.found()
         optional_deps += gtk_wayland_dep
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
+  endif
 
-    if have_gtk3_gl_windowing
-      gtk_sources += [
-        'gstgtkglsink.c',
-        'gtkgstglwidget.c',
-      ]
-      optional_deps += gstgl_dep
-      gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK3_GL']
-    endif
+  if have_gtk_gl_windowing
+    lib_sources += [
+      'gstgtkglsink.c',
+      'gtkgstglwidget.c',
+    ]
+    optional_deps += gstgl_dep
+    gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK_GL']
   endif
 
-  gstgtk = library('gstgtk',
-    gtk_sources,
+  if gtk_ver == 3
+    gtk_optional_deps = optional_deps
+  elif gtk_ver == 4
+    gtk4_optional_deps = optional_deps
+    gtk_defines += '-DBUILD_FOR_GTK4'
+  endif
+
+  lib_name = 'gstgtk'
+  if gtk_ver > 3
+    lib_name += gtk_ver.to_string()
+  endif
+
+  gstgtk = library(lib_name,
+    lib_sources,
     c_args : gst_plugins_good_args + gtk_defines,
     link_args : noseh_link_args,
     include_directories : [configinc],
-    dependencies : [gtk_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
+    dependencies : [lib_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
     install : true,
     install_dir : plugins_install_dir,
   )
   pkgconfig.generate(gstgtk, install_dir : plugins_pkgconfig_install_dir)
-endif
+endforeach
 
--- meson_options.txt.orig	2019-12-03 11:06:37 UTC
+++ meson_options.txt
@@ -53,6 +53,7 @@ option('dv1394', type : 'feature', value : 'auto', des
 option('flac', type : 'feature', value : 'auto', description : 'FLAC audio codec plugin')
 option('gdk-pixbuf', type : 'feature', value : 'auto', description : 'gdk-pixbuf image decoder, overlay, and sink plugin')
 option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink plugin')
+option('gtk4', type : 'feature', value : 'disabled', description : 'GTK4 video sink plugin')
 option('jack', type : 'feature', value : 'auto', description : 'JACK audio source/sink plugin')
 option('jpeg', type : 'feature', value : 'auto', description : 'JPEG image codec plugin')
 option('lame', type : 'feature', value : 'auto', description : 'LAME mp3 audio encoder plugin')
--- tests/examples/gtk/meson.build.orig	2019-12-03 11:06:37 UTC
+++ tests/examples/gtk/meson.build
@@ -1,5 +1,5 @@
 executable('gtksink', 'gtksink.c',
-  dependencies: [gst_dep, gtk_dep, optional_deps],
+  dependencies: [gst_dep, gtk_dep, gtk_optional_deps],
   c_args: gst_plugins_good_args,
   include_directories: [configinc],
   install: false)

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-meson__options.txt (+10 lines)
1	--- meson_options.txt.orig 2019-12-03 11:06:37 UTC
2	+++ meson_options.txt
3	@@ -53,6 +53,7 @@ option('dv1394', type : 'feature', value : 'auto', des
4	option('flac', type : 'feature', value : 'auto', description : 'FLAC audio codec plugin')
5	option('gdk-pixbuf', type : 'feature', value : 'auto', description : 'gdk-pixbuf image decoder, overlay, and sink plugin')
6	option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink plugin')
7	+option('gtk4', type : 'feature', value : 'disabled', description : 'GTK4 video sink plugin')
8	option('jack', type : 'feature', value : 'auto', description : 'JACK audio source/sink plugin')
9	option('jpeg', type : 'feature', value : 'auto', description : 'JPEG image codec plugin')
10	option('lame', type : 'feature', value : 'auto', description : 'LAME mp3 audio encoder plugin')

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-tests_examples_gtk_meson.build (+9 lines)
1	--- tests/examples/gtk/meson.build.orig 2019-12-03 11:06:37 UTC
2	+++ tests/examples/gtk/meson.build
3	@@ -1,5 +1,5 @@
4	executable('gtksink', 'gtksink.c',
5	- dependencies: [gst_dep, gtk_dep, optional_deps],
6	+ dependencies: [gst_dep, gtk_dep, gtk_optional_deps],
7	c_args: gst_plugins_good_args,
8	include_directories: [configinc],
9	install: false)




--- docs/gst_plugins_cache.json.orig	2022-06-15 22:36:22 UTC
+++ docs/gst_plugins_cache.json
@@ -7087,10 +7087,10 @@
         "url": "Unknown package origin"
     },
     "gtk": {
-        "description": "Gtk+ sink",
+        "description": "GTK sink",
         "elements": {
             "gtkglsink": {
-                "author": "Matthew Waters <matthew@centricular.com>",
+                "author": "Matthew Waters <matthew@centricular.com>, Rafał Dzięgiel <rafostar.github@gmail.com>",
                 "description": "A video sink that renders to a GtkWidget using OpenGL",
                 "hierarchy": [
                     "GstGtkGLSink",
@@ -7106,7 +7106,7 @@
                     "GstNavigation"
                 ],
                 "klass": "Sink/Video",
-                "long-name": "Gtk GL Video Sink",
+                "long-name": "GTK GL Video Sink",
                 "pad-templates": {
                     "sink": {
                         "caps": "video/x-raw(memory:GLMemory):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n\nvideo/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
@@ -7147,7 +7147,7 @@
                     "GstNavigation"
                 ],
                 "klass": "Sink/Video",
-                "long-name": "Gtk Video Sink",
+                "long-name": "GTK Video Sink",
                 "pad-templates": {
                     "sink": {
                         "caps": "video/x-raw:\n         format: { BGRx, BGRA }\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
@@ -7224,6 +7224,127 @@
                         "default": "0/1",
                         "max": "2147483647/1",
                         "min": "0/2147483647",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstFraction",
+                        "writable": true
+                    },
+                    "widget": {
+                        "blurb": "The GtkWidget to place in the widget hierarchy (must only be get from the GTK main thread)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GtkWidget",
+                        "writable": false
+                    }
+                }
+            }
+        },
+        "package": "GStreamer Good Plug-ins",
+        "source": "gst-plugins-good",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
+    "gtk4": {
+        "description": "GTK4 sink",
+        "elements": {
+            "gtk4glsink": {
+                "author": "Matthew Waters <matthew@centricular.com>, Rafał Dzięgiel <rafostar.github@gmail.com>",
+                "description": "A video sink that renders to a GtkWidget using OpenGL",
+                "hierarchy": [
+                    "GstGtkGLSink",
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "klass": "Sink/Video",
+                "long-name": "GTK4 GL Video Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:GLMemory):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n\nvideo/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "gtk4sink": {
+                "author": "Matthew Waters <matthew@centricular.com>",
+                "description": "A video sink that renders to a GtkWidget",
+                "hierarchy": [
+                    "GstGtkSink",
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "klass": "Sink/Video",
+                "long-name": "GTK4 Video Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw:\n         format: { BGRx, BGRA }\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstgtk4",
+        "license": "LGPL",
+        "other-types": {
+            "GstGtkBaseSink": {
+                "hierarchy": [
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "kind": "object",
+                "properties": {
+                    "force-aspect-ratio": {
+                        "blurb": "When enabled, scaling will respect original aspect ratio",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pixel-aspect-ratio": {
+                        "blurb": "The pixel aspect ratio of the device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0/1",
+                        "max": "2147483647/1",
+                        "min": "0/1",
                         "mutable": "null",
                         "readable": true,
                         "type": "GstFraction",




--- ext/gtk/gstgtkbasesink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -80,7 +81,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstGtkBaseSink, gst_
     G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
         gst_gtk_base_sink_navigation_interface_init);
     GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_sink,
-        "gtkbasesink", 0, "Gtk Video Sink base class"));
+        "gtkbasesink", 0, "GTK Video Sink base class"));
 
 
 static void
@@ -100,7 +101,7 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
   gobject_class->get_property = gst_gtk_base_sink_get_property;
 
   g_object_class_install_property (gobject_class, PROP_WIDGET,
-      g_param_spec_object ("widget", "Gtk Widget",
+      g_param_spec_object ("widget", "GTK Widget",
           "The GtkWidget to place in the widget hierarchy "
           "(must only be get from the GTK main thread)",
           GTK_TYPE_WIDGET,
@@ -135,10 +136,13 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
           G_MAXINT, G_MAXINT, 1, DEFAULT_VIDEO_PAR_N, DEFAULT_VIDEO_PAR_D,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /* Disabling alpha was removed in GTK4 */
+#if !defined(BUILD_FOR_GTK4)
   g_object_class_install_property (gobject_class, PROP_IGNORE_ALPHA,
       g_param_spec_boolean ("ignore-alpha", "Ignore Alpha",
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
 
   gobject_class->finalize = gst_gtk_base_sink_finalize;
 
@@ -169,6 +173,8 @@ gst_gtk_base_sink_finalize (GObject * object)
 {
   GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);
 
+  GST_DEBUG ("finalizing base sink");
+
   GST_OBJECT_LOCK (gtk_sink);
   if (gtk_sink->window && gtk_sink->window_destroy_id)
     g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id);
@@ -193,6 +199,14 @@ static void
 window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
 {
   GST_OBJECT_LOCK (gtk_sink);
+  if (gtk_sink->widget) {
+    if (gtk_sink->widget_destroy_id) {
+      g_signal_handler_disconnect (gtk_sink->widget,
+          gtk_sink->widget_destroy_id);
+      gtk_sink->widget_destroy_id = 0;
+    }
+    g_clear_object (&gtk_sink->widget);
+  }
   gtk_sink->window = NULL;
   GST_OBJECT_UNLOCK (gtk_sink);
 }
@@ -205,7 +219,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
 
   /* Ensure GTK is initialized, this has no side effect if it was already
    * initialized. Also, we do that lazily, so the application can be first */
-  if (!gtk_init_check (NULL, NULL)) {
+  if (!gtk_init_check (
+#if !defined(BUILD_FOR_GTK4)
+          NULL, NULL
+#endif
+      )) {
     GST_INFO_OBJECT (gtk_sink, "Could not ensure GTK initialization.");
     return NULL;
   }
@@ -224,9 +242,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
       g_object_bind_property (gtk_sink, "video-aspect-ratio-override",
       gtk_sink->widget, "video-aspect-ratio-override",
       G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#if !defined(BUILD_FOR_GTK4)
   gtk_sink->bind_ignore_alpha =
       g_object_bind_property (gtk_sink, "ignore-alpha", gtk_sink->widget,
       "ignore-alpha", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#endif
 
   /* Take the floating ref, other wise the destruction of the container will
    * make this widget disappear possibly before we are done. */
@@ -372,6 +392,9 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
   GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink);
   GtkWidget *toplevel;
+#if defined(BUILD_FOR_GTK4)
+  GtkRoot *root;
+#endif
 
   if (gst_gtk_base_sink_get_widget (gst_sink) == NULL) {
     GST_ERROR_OBJECT (bsink, "Could not ensure GTK initialization.");
@@ -380,19 +403,47 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
 
   /* After this point, gtk_sink->widget will always be set */
 
+#if defined(BUILD_FOR_GTK4)
+  root = gtk_widget_get_root (GTK_WIDGET (gst_sink->widget));
+  if (!GTK_IS_ROOT (root)) {
+    GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gst_sink->widget));
+    if (parent) {
+      GtkWidget *temp_parent;
+      while ((temp_parent = gtk_widget_get_parent (parent)))
+        parent = temp_parent;
+    }
+    toplevel = (parent) ? parent : GTK_WIDGET (gst_sink->widget);
+#else
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gst_sink->widget));
   if (!gtk_widget_is_toplevel (toplevel)) {
+#endif
     /* sanity check */
     g_assert (klass->window_title);
 
     /* User did not add widget its own UI, let's popup a new GtkWindow to
      * make gst-launch-1.0 work. */
-    gst_sink->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gst_sink->window = gtk_window_new (
+#if !defined(BUILD_FOR_GTK4)
+        GTK_WINDOW_TOPLEVEL
+#endif
+        );
     gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
     gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
-    gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
-    gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy",
-        G_CALLBACK (window_destroy_cb), gst_sink);
+
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_set_child (GTK_WINDOW (
+#else
+    gtk_container_add (GTK_CONTAINER (
+#endif
+            gst_sink->window), toplevel);
+
+    gst_sink->window_destroy_id = g_signal_connect (
+#if defined(BUILD_FOR_GTK4)
+        GTK_WINDOW (gst_sink->window),
+#else
+        gst_sink->window,
+#endif
+        "destroy", G_CALLBACK (window_destroy_cb), gst_sink);
   }
 
   return TRUE;
@@ -411,7 +462,11 @@ gst_gtk_base_sink_stop_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
 
   if (gst_sink->window) {
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_destroy (GTK_WINDOW (gst_sink->window));
+#else
     gtk_widget_destroy (gst_sink->window);
+#endif
     gst_sink->window = NULL;
     gst_sink->widget = NULL;
   }
@@ -432,10 +487,14 @@ gst_gtk_base_sink_stop (GstBaseSink * bsink)
 }
 
 static void
-gst_gtk_widget_show_all_and_unref (GtkWidget * widget)
+gst_gtk_window_show_all_and_unref (GtkWidget * window)
 {
-  gtk_widget_show_all (widget);
-  g_object_unref (widget);
+#if defined(BUILD_FOR_GTK4)
+  gtk_window_present (GTK_WINDOW (window));
+#else
+  gtk_widget_show_all (window);
+#endif
+  g_object_unref (window);
 }
 
 static GstStateChangeReturn
@@ -463,7 +522,7 @@ gst_gtk_base_sink_change_state (GstElement * element, 
       GST_OBJECT_UNLOCK (gtk_sink);
 
       if (window)
-        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_widget_show_all_and_unref,
+        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_window_show_all_and_unref,
             window);
 
       break;




--- ext/gtk/gstgtkbasesink.h.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.h
@@ -51,14 +51,14 @@ GType gst_gtk_base_sink_get_type (void);
 struct _GstGtkBaseSink
 {
   /* <private> */
-  GstVideoSink         parent;
+  GstVideoSink          parent;
 
-  GstVideoInfo         v_info;
+  GstVideoInfo          v_info;
 
   GtkGstBaseWidget     *widget;
 
   /* properties */
-  gboolean             force_aspect_ratio;
+  gboolean              force_aspect_ratio;
   GBinding             *bind_aspect_ratio;
 
   gint                  par_n;
@@ -73,8 +73,8 @@ struct _GstGtkBaseSink
   GBinding             *bind_ignore_alpha;
 
   GtkWidget            *window;
-  gulong               widget_destroy_id;
-  gulong               window_destroy_id;
+  gulong                widget_destroy_id;
+  gulong                window_destroy_id;
 };
 
 /**




--- ext/gtk/gstgtkglsink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkglsink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,6 +24,12 @@
  * @title: gtkglsink
  */
 
+/**
+ * SECTION:element-gtk4glsink
+ * @title: gtk4glsink
+ */
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -65,7 +72,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template =
 #define gst_gtk_gl_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,
     GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink,
-        "gtkglsink", 0, "Gtk GL Video Sink"));
+    GTKCONFIG_GLSINK, 0, GTKCONFIG_NAME " GL Video Sink"));
 GST_ELEMENT_REGISTER_DEFINE (gtkglsink, "gtkglsink", GST_RANK_NONE,
     GST_TYPE_GTK_GL_SINK);
 
@@ -101,7 +108,7 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
   gstbasesink_class->event = gst_gtk_gl_sink_event;
 
   gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new;
-  gstgtkbasesink_class->window_title = "Gtk+ GL renderer";
+  gstgtkbasesink_class->window_title = GTKCONFIG_NAME " GL Renderer";
 
   /**
    * gtkglsink:rotate-method:
@@ -117,9 +124,11 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
           GST_TYPE_VIDEO_ORIENTATION_METHOD, GST_VIDEO_ORIENTATION_IDENTITY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " GL Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL",
-      "Matthew Waters <matthew@centricular.com>");
+      "Matthew Waters <matthew@centricular.com>, "
+      "Rafał Dzięgiel <rafostar.github@gmail.com>");
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_gtk_gl_sink_template);
@@ -202,16 +211,18 @@ gst_gtk_gl_sink_query (GstBaseSink * bsink, GstQuery *
 }
 
 static void
-_size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle,
-    GstGtkGLSink * gtk_sink)
+_size_changed_cb (GtkWidget * widget, gint width,
+    gint height, GstGtkGLSink * gtk_sink)
 {
-  gint scale_factor, width, height;
   gboolean reconfigure;
 
-  scale_factor = gtk_widget_get_scale_factor (widget);
-  width = scale_factor * gtk_widget_get_allocated_width (widget);
-  height = scale_factor * gtk_widget_get_allocated_height (widget);
+  GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
 
+  /* Ignore size changes before widget is negotiated
+   * we are going to queue a resize after negotiation */
+  if (!base_widget->negotiated)
+    return;
+
   GST_OBJECT_LOCK (gtk_sink);
   reconfigure =
       (width != gtk_sink->display_width || height != gtk_sink->display_height);
@@ -220,7 +231,7 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
   GST_OBJECT_UNLOCK (gtk_sink);
 
   if (reconfigure) {
-    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad.");
+    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad");
     gst_pad_push_event (GST_BASE_SINK (gtk_sink)->sinkpad,
         gst_event_new_reconfigure ());
   }
@@ -229,9 +240,9 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
 static void
 destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink)
 {
-  if (gtk_sink->size_allocate_sig_handler) {
-    g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (widget, gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {
@@ -254,29 +265,34 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink)
   gst_widget = GTK_GST_GL_WIDGET (base_sink->widget);
 
   /* Track the allocation size */
-  gtk_sink->size_allocate_sig_handler =
-      g_signal_connect (gst_widget, "size-allocate",
-      G_CALLBACK (_size_changed_cb), gtk_sink);
+  if (!gtk_sink->widget_resize_sig_handler) {
+    gtk_sink->widget_resize_sig_handler =
+        g_signal_connect (gst_widget, "resize",
+        G_CALLBACK (_size_changed_cb), gtk_sink);
+  }
 
-  gtk_sink->widget_destroy_sig_handler =
-      g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
-      gtk_sink);
+  if (!gtk_sink->widget_destroy_sig_handler) {
+    gtk_sink->widget_destroy_sig_handler =
+        g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
+        gtk_sink);
+  }
 
-  _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink);
-
   if (!gtk_gst_gl_widget_init_winsys (gst_widget)) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to initialize OpenGL with Gtk"), (NULL));
+            "Failed to initialize OpenGL with GTK"), (NULL));
     return FALSE;
   }
 
-  gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
-  gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
-  gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
+  if (!gtk_sink->display)
+    gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
+  if (!gtk_sink->context)
+    gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
+  if (!gtk_sink->gtk_context)
+    gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
 
   if (!gtk_sink->display || !gtk_sink->context || !gtk_sink->gtk_context) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to retrieve OpenGL context from Gtk"), (NULL));
+            "Failed to retrieve OpenGL context from GTK"), (NULL));
     return FALSE;
   }
 
@@ -290,7 +306,14 @@ static gboolean
 gst_gtk_gl_sink_stop (GstBaseSink * bsink)
 {
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (bsink);
+  GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (bsink);
 
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (base_sink->widget,
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
+  }
+
   if (gtk_sink->display) {
     gst_object_unref (gtk_sink->display);
     gtk_sink->display = NULL;
@@ -432,10 +455,10 @@ gst_gtk_gl_sink_finalize (GObject * object)
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object);
   GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object);
 
-  if (gtk_sink->size_allocate_sig_handler) {
+  if (gtk_sink->widget_resize_sig_handler) {
     g_signal_handler_disconnect (base_sink->widget,
-        gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files4/patch-ext_gtk_gstgtkglsink.h (+11 lines)
1	--- ext/gtk/gstgtkglsink.h.orig 2022-06-15 22:36:22 UTC
2	+++ ext/gtk/gstgtkglsink.h
3	@@ -57,7 +57,7 @@ struct _GstGtkGLSink
4	gint display_width;
5	gint display_height;
6
7	- gulong size_allocate_sig_handler;
8	+ gulong widget_resize_sig_handler;
9	gulong widget_destroy_sig_handler;
10	};
11




--- ext/gtk/gstgtksink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtksink.c
@@ -19,15 +19,22 @@
  */
 
 /**
- * SECTION:element-gtkgstsink
- * @title: gtkgstsink
+ * SECTION:element-gtksink
+ * @title: gtksink
  *
  */
 
+/**
+ * SECTION:element-gtk4sink
+ * @title: gtk4sink
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gtkgstwidget.h"
 #include "gstgtksink.h"
 
@@ -64,9 +71,10 @@ gst_gtk_sink_class_init (GstGtkSinkClass * klass)
   base_class = (GstGtkBaseSinkClass *) klass;
 
   base_class->create_widget = gtk_gst_widget_new;
-  base_class->window_title = "Gtk+ Cairo renderer";
+  base_class->window_title = GTKCONFIG_NAME " Cairo Renderer";
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget",
       "Matthew Waters <matthew@centricular.com>");
 




--- ext/gtk/gstplugin.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstplugin.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -22,8 +23,10 @@
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gstgtksink.h"
-#if defined(HAVE_GTK3_GL)
+
+#if defined(HAVE_GTK_GL)
 #include "gstgtkglsink.h"
 #endif
 
@@ -32,10 +35,10 @@ plugin_init (GstPlugin * plugin)
 {
   gboolean ret = FALSE;
 
-  ret |= GST_ELEMENT_REGISTER (gtksink, plugin);
+  ret |= GST_ELEMENT_REGISTER (GTKCONFIG_SINK, plugin);
 
-#if defined(HAVE_GTK3_GL)
-  ret |= GST_ELEMENT_REGISTER (gtkglsink, plugin);
+#if defined(HAVE_GTK_GL)
+  ret |= GST_ELEMENT_REGISTER (GTKCONFIG_GLSINK, plugin);
 #endif
 
   return ret;
@@ -43,7 +46,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gtk,
-    "Gtk+ sink",
+    GTKCONFIG_PLUGIN, GTKCONFIG_NAME " sink",
     plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)




--- ext/gtk/gtkconfig.h.orig	2022-09-18 19:39:45 UTC
+++ ext/gtk/gtkconfig.h
@@ -0,0 +1,31 @@
+/*
+ * GStreamer
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if defined(BUILD_FOR_GTK4)
+#define GTKCONFIG_PLUGIN gtk4
+#define GTKCONFIG_NAME "GTK4"
+#define GTKCONFIG_SINK "gtk4sink"
+#define GTKCONFIG_GLSINK "gtk4glsink"
+#else
+#define GTKCONFIG_PLUGIN gtk
+#define GTKCONFIG_NAME "GTK"
+#define GTKCONFIG_SINK "gtksink"
+#define GTKCONFIG_GLSINK "gtkglsink"
+#endif




--- ext/gtk/gtkgstbasewidget.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gtkgstbasewidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -208,7 +209,23 @@ gtk_gst_base_widget_get_preferred_height (GtkWidget * 
     *natural = video_height;
 }
 
+#if defined(BUILD_FOR_GTK4)
 static void
+gtk_gst_base_widget_measure (GtkWidget * widget, GtkOrientation orientation,
+    gint for_size, gint * min, gint * natural,
+    gint * minimum_baseline, gint * natural_baseline)
+{
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    gtk_gst_base_widget_get_preferred_width (widget, min, natural);
+  else
+    gtk_gst_base_widget_get_preferred_height (widget, min, natural);
+
+  *minimum_baseline = -1;
+  *natural_baseline = -1;
+}
+#endif
+
+static void
 gtk_gst_base_widget_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -281,22 +298,46 @@ _gdk_key_to_navigation_string (guint keyval)
   }
 }
 
+static GdkEvent *
+_get_current_event (GtkEventController * controller)
+{
+#if defined(BUILD_FOR_GTK4)
+  return gtk_event_controller_get_current_event (controller);
+#else
+  return gtk_get_current_event ();
+#endif
+}
+
+static void
+_gdk_event_free (GdkEvent * event)
+{
+#if !defined(BUILD_FOR_GTK4)
+  if (event)
+    gdk_event_free (event);
+#endif
+}
+
 static gboolean
-gtk_gst_base_widget_key_event (GtkWidget * widget, GdkEventKey * event)
+gtk_gst_base_widget_key_event (GtkEventControllerKey * key_controller,
+    guint keyval, guint keycode, GdkModifierType state)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (key_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
-      const gchar *str = _gdk_key_to_navigation_string (event->keyval);
-      const gchar *key_type =
-          event->type == GDK_KEY_PRESS ? "key-press" : "key-release";
+      GdkEvent *event = _get_current_event (controller);
+      const gchar *str = _gdk_key_to_navigation_string (keyval);
 
-      if (!str)
-        str = event->string;
-
-      gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      if (str) {
+        const gchar *key_type =
+            gdk_event_get_event_type (event) ==
+            GDK_KEY_PRESS ? "key-press" : "key-release";
+        gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      }
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -371,18 +412,38 @@ gtk_gst_base_widget_display_size_to_stream_size (GtkGs
 }
 
 static gboolean
-gtk_gst_base_widget_button_event (GtkWidget * widget, GdkEventButton * event)
+gtk_gst_base_widget_button_event (
+#if defined(BUILD_FOR_GTK4)
+    GtkGestureClick * gesture,
+#else
+    GtkGestureMultiPress * gesture,
+#endif
+    gint n_press, gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (gesture);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
+      GdkEvent *event = _get_current_event (controller);
       const gchar *key_type =
-          event->type ==
-          GDK_BUTTON_PRESS ? "mouse-button-press" : "mouse-button-release";
+          gdk_event_get_event_type (event) == GDK_BUTTON_PRESS
+          ? "mouse-button-press" : "mouse-button-release";
+#if !defined(BUILD_FOR_GTK4)
+      guint button;
+      gdk_event_get_button (event, &button);
+#endif
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), key_type,
-          event->button, event->x, event->y);
+#if defined(BUILD_FOR_GTK4)
+          /* Gesture is set to ignore other buttons so we do not have to check */
+          GDK_BUTTON_PRIMARY,
+#else
+          button,
+#endif
+          event->x, event->y);
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -391,15 +452,18 @@ gtk_gst_base_widget_button_event (GtkWidget * widget, 
 }
 
 static gboolean
-gtk_gst_base_widget_motion_event (GtkWidget * widget, GdkEventMotion * event)
+gtk_gst_base_widget_motion_event (GtkEventControllerMotion * motion_controller,
+    gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (motion_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), "mouse-move",
-          0, event->x, event->y);
+          0, x, y);
     }
     g_object_unref (element);
   }
@@ -490,24 +554,20 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass 
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+#if defined(BUILD_FOR_GTK4)
+  widget_klass->measure = gtk_gst_base_widget_measure;
+#else
   widget_klass->get_preferred_width = gtk_gst_base_widget_get_preferred_width;
   widget_klass->get_preferred_height = gtk_gst_base_widget_get_preferred_height;
-  widget_klass->key_press_event = gtk_gst_base_widget_key_event;
-  widget_klass->key_release_event = gtk_gst_base_widget_key_event;
-  widget_klass->button_press_event = gtk_gst_base_widget_button_event;
-  widget_klass->button_release_event = gtk_gst_base_widget_button_event;
-  widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event;
-  widget_klass->scroll_event = gtk_gst_base_widget_scroll_event;
+#endif
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0,
-      "Gtk Video Base Widget");
+      "GTK Video Base Widget");
 }
 
 void
 gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
 {
-  int event_mask;
-
   widget->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
   widget->par_n = DEFAULT_DISPLAY_PAR_N;
   widget->par_d = DEFAULT_DISPLAY_PAR_D;
@@ -521,20 +581,66 @@ gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
   g_weak_ref_init (&widget->element, NULL);
   g_mutex_init (&widget->lock);
 
+  widget->key_controller = gtk_event_controller_key_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->key_controller, "key-pressed",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+  g_signal_connect (widget->key_controller, "key-released",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+
+  widget->motion_controller = gtk_event_controller_motion_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->motion_controller, "motion",
+      G_CALLBACK (gtk_gst_base_widget_motion_event), NULL);
+
+  widget->click_gesture =
+#if defined(BUILD_FOR_GTK4)
+      gtk_gesture_click_new ();
+#else
+      gtk_gesture_multi_press_new (GTK_WIDGET (widget));
+#endif
+  g_signal_connect (widget->click_gesture, "pressed",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+  g_signal_connect (widget->click_gesture, "released",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+
+#if defined(BUILD_FOR_GTK4)
+  /* Otherwise widget in grid will appear as a 1x1px
+   * video which might be misleading for users */
+  gtk_widget_set_hexpand (GTK_WIDGET (widget), TRUE);
+  gtk_widget_set_vexpand (GTK_WIDGET (widget), TRUE);
+
+  gtk_widget_set_focusable (GTK_WIDGET (widget), TRUE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (widget->click_gesture),
+      GDK_BUTTON_PRIMARY);
+
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->key_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->motion_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget),
+      GTK_EVENT_CONTROLLER (widget->click_gesture));
+#endif
+
   gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE);
-  event_mask = gtk_widget_get_events (GTK_WIDGET (widget));
-  event_mask |= GDK_KEY_PRESS_MASK
-      | GDK_KEY_RELEASE_MASK
-      | GDK_BUTTON_PRESS_MASK
-      | GDK_BUTTON_RELEASE_MASK
-      | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_SCROLL_MASK;
-  gtk_widget_set_events (GTK_WIDGET (widget), event_mask);
 }
 
 void
 gtk_gst_base_widget_finalize (GObject * object)
 {
   GtkGstBaseWidget *widget = GTK_GST_BASE_WIDGET (object);
+
+  /* GTK4 takes ownership of EventControllers
+   * while GTK3 still needs manual unref */
+#if !defined(BUILD_FOR_GTK4)
+  g_object_unref (widget->key_controller);
+  g_object_unref (widget->motion_controller);
+  g_object_unref (widget->click_gesture);
+#endif
 
   gst_buffer_replace (&widget->pending_buffer, NULL);
   gst_buffer_replace (&widget->buffer, NULL);




--- ext/gtk/gtkgstbasewidget.h
+++ ext/gtk/gtkgstbasewidget.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,6 +26,10 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
+#if !defined(BUILD_FOR_GTK4)
+#include <gdk/gdk.h>
+#endif
+
 #define GTK_GST_BASE_WIDGET(w)         ((GtkGstBaseWidget *)(w))
 #define GTK_GST_BASE_WIDGET_CLASS(k)   ((GtkGstBaseWidgetClass *)(k))
 #define GTK_GST_BASE_WIDGET_LOCK(w)    g_mutex_lock(&((GtkGstBaseWidget*)(w))->lock)
@@ -39,9 +44,7 @@ struct _GtkGstBaseWidget
 {
   union {
     GtkDrawingArea drawing_area;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLArea gl_area;
-#endif
   } parent;
 
   /* properties */
@@ -67,6 +70,11 @@ struct _GtkGstBaseWidget
   GMutex lock;
   GWeakRef element;
 
+  /* event controllers */
+  GtkEventController *key_controller;
+  GtkEventController *motion_controller;
+  GtkGesture *click_gesture;
+
   /* Pending draw idles callback */
   guint draw_id;
 };
@@ -75,9 +83,7 @@ struct _GtkGstBaseWidgetClass
 {
   union {
     GtkDrawingAreaClass drawing_area_class;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLAreaClass gl_area_class;
-#endif
   } parent_class;
 };
 




--- ext/gtk/gtkgstglwidget.c
+++ ext/gtk/gtkgstglwidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,12 +31,20 @@
 #include <gst/video/video.h>
 
 #if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/x11/gdkx.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #include <gst/gl/x11/gstgldisplay_x11.h>
 #endif
 
 #if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
+#endif
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
@@ -78,8 +87,7 @@ static const GLfloat vertices[] = {
 G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
     G_ADD_PRIVATE (GtkGstGLWidget)
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
-        "Gtk Gst GL Widget");
-    );
+        "GTK Gst GL Widget"));
 
 static void
 gtk_gst_gl_widget_bind_buffer (GtkGstGLWidget * gst_widget)
@@ -407,8 +415,11 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)
 
   GST_INFO ("Created %" GST_PTR_FORMAT, priv->display);
 
+  /* GTK4 always has alpha */
+#if !defined(BUILD_FOR_GTK4)
   gtk_gl_area_set_has_alpha (GTK_GL_AREA (gst_widget),
       !base_widget->ignore_alpha);
+#endif
 }
 
 static void




--- ext/gtk/gtkgstwidget.c
+++ ext/gtk/gtkgstwidget.c
@@ -38,17 +38,15 @@
 
 G_DEFINE_TYPE (GtkGstWidget, gtk_gst_widget, GTK_TYPE_DRAWING_AREA);
 
-static gboolean
-gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+static void
+_drawing_area_draw (GtkDrawingArea * da, cairo_t * cr,
+    gint widget_width, gint widget_height, gpointer data)
 {
+  GtkWidget *widget = GTK_WIDGET (da);
   GtkGstBaseWidget *gst_widget = (GtkGstBaseWidget *) widget;
-  guint widget_width, widget_height;
   cairo_surface_t *surface;
   GstVideoFrame frame;
 
-  widget_width = gtk_widget_get_allocated_width (widget);
-  widget_height = gtk_widget_get_allocated_height (widget);
-
   GTK_GST_BASE_WIDGET_LOCK (gst_widget);
 
   /* There is not much to optimize in term of redisplay, so simply swap the
@@ -148,7 +146,10 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       color.alpha = 1.0;
     } else {
       gtk_style_context_get_color (gtk_widget_get_style_context (widget),
-          GTK_STATE_FLAG_NORMAL, &color);
+#if !defined(BUILD_FOR_GTK4)
+          GTK_STATE_FLAG_NORMAL,
+#endif
+          &color);
     }
     gdk_cairo_set_source_rgba (cr, &color);
     cairo_rectangle (cr, 0, 0, widget_width, widget_height);
@@ -156,8 +157,20 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   }
 
   GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
+}
+
+#if !defined(BUILD_FOR_GTK4)
+static gboolean
+gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+{
+  gint width = gtk_widget_get_allocated_width (widget);
+  gint height = gtk_widget_get_allocated_height (widget);
+
+  _drawing_area_draw (GTK_DRAWING_AREA (widget), cr, width, height, NULL);
+
   return FALSE;
 }
+#endif
 
 static void
 gtk_gst_widget_finalize (GObject * object)
@@ -171,17 +184,25 @@ static void
 gtk_gst_widget_class_init (GtkGstWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
+#if !defined(BUILD_FOR_GTK4)
   GtkWidgetClass *widget_klass = (GtkWidgetClass *) klass;
+#endif
 
   gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
   gobject_klass->finalize = gtk_gst_widget_finalize;
+#if !defined(BUILD_FOR_GTK4)
   widget_klass->draw = gtk_gst_widget_draw;
+#endif
 }
 
 static void
 gtk_gst_widget_init (GtkGstWidget * widget)
 {
   gtk_gst_base_widget_init (GTK_GST_BASE_WIDGET (widget));
+#if defined(BUILD_FOR_GTK4)
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (widget),
+      _drawing_area_draw, NULL, NULL);
+#endif
 }
 
 GtkWidget *




--- ext/gtk/meson.build
+++ ext/gtk/meson.build
@@ -1,3 +1,4 @@
+gtk_versions = [3, 4]
 gtk_sources = [
   'gstgtkbasesink.c',
   'gstgtksink.c',
@@ -6,54 +7,86 @@ gtk_sources = [
   'gtkgstbasewidget.c',
   'gtkgstwidget.c',
 ]
+gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
+gtk_optional_deps = []
 
-gtk_defines = []
-optional_deps = []
+gtk4_dep = dependency('gtk4', required : get_option('gtk4'))
+gtk4_optional_deps = []
 
-gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-if gtk_dep.found()
-  # FIXME: automagic
-  if have_gstgl and gtk_dep.version().version_compare('>=3.15.0')
-    have_gtk3_gl_windowing = false
+foreach gtk_ver : gtk_versions
+  gtkv = 'gtk' + gtk_ver.to_string()
+
+  gtk_state = get_option(gtkv)
+  if gtk_state.disabled()
+    continue
+  endif
+
+  min_ver = gtk_ver >= 4 ? '3.99.2'          : '3.24.0'
+  x11_str = gtk_ver >= 4 ? gtkv + '-x11'     : 'gtk+-x11-3.0'
+  way_str = gtk_ver >= 4 ? gtkv + '-wayland' : 'gtk+-wayland-3.0'
+  lib_dep = gtk_ver >= 4 ? gtk4_dep          : gtk_dep
+
+  if not lib_dep.found() or not lib_dep.version().version_compare('>=' + min_ver)
+    continue
+  endif
+
+  lib_sources = []
+  gtk_defines = []
+  optional_deps = []
+  have_gtk_gl_windowing = false
 
+  lib_sources += gtk_sources
+
+  if have_gstgl
     if gst_gl_have_window_x11 and gst_gl_have_platform_glx
       # FIXME: automagic
-      gtk_x11_dep = dependency('gtk+-x11-3.0', required : false)
+      gtk_x11_dep = dependency(x11_str, required : false)
       if gtk_x11_dep.found()
         optional_deps += [gtk_x11_dep, gstglx11_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
 
     if gst_gl_have_window_wayland and gst_gl_have_platform_egl
       # FIXME: automagic
-      gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : false)
+      gtk_wayland_dep = dependency(way_str, required : false)
       if gtk_wayland_dep.found()
         optional_deps += [gtk_wayland_dep, gstglegl_dep, gstglwayland_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
+  endif
 
-    if have_gtk3_gl_windowing
-      gtk_sources += [
-        'gstgtkglsink.c',
-        'gtkgstglwidget.c',
-      ]
-      optional_deps += [gstgl_dep, gstglproto_dep]
-      gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK3_GL']
-    endif
+  if have_gtk_gl_windowing
+    lib_sources += [
+      'gstgtkglsink.c',
+      'gtkgstglwidget.c',
+    ]
+    optional_deps += [gstgl_dep, gstglproto_dep]
+    gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK_GL']
+  endif
+
+  if gtk_ver == 3
+    gtk_optional_deps = optional_deps
+  elif gtk_ver == 4
+    gtk4_optional_deps = optional_deps
+    gtk_defines += '-DBUILD_FOR_GTK4'
+  endif
+
+  lib_name = 'gstgtk'
+  if gtk_ver > 3
+    lib_name += gtk_ver.to_string()
   endif
 
-  gstgtk = library('gstgtk',
-    gtk_sources,
+  gstgtk = library(lib_name,
+    lib_sources,
     c_args : gst_plugins_good_args + gtk_defines,
     link_args : noseh_link_args,
     include_directories : [configinc],
-    dependencies : [gtk_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
+    dependencies : [lib_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
     install : true,
     install_dir : plugins_install_dir,
   )
   pkgconfig.generate(gstgtk, install_dir : plugins_pkgconfig_install_dir)
   plugins += [gstgtk]
-endif
-
+endforeach

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files4/patch-meson__options.txt (+10 lines)
1	--- meson_options.txt
2	+++ meson_options.txt
3	@@ -53,6 +53,7 @@ option('dv1394', type : 'feature', value : 'auto', description : 'Digital IEEE13
4	option('flac', type : 'feature', value : 'auto', description : 'FLAC audio codec plugin')
5	option('gdk-pixbuf', type : 'feature', value : 'auto', description : 'gdk-pixbuf image decoder, overlay, and sink plugin')
6	option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink plugin')
7	+option('gtk4', type : 'feature', value : 'disabled', description : 'GTK4 video sink plugin')
8	option('jack', type : 'feature', value : 'auto', description : 'JACK audio source/sink plugin')
9	option('jpeg', type : 'feature', value : 'auto', description : 'JPEG image codec plugin')
10	option('lame', type : 'feature', value : 'auto', description : 'LAME mp3 audio encoder plugin')

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files4/patch-tests_examples_gtk_meson.build (+9 lines)
1	--- tests/examples/gtk/meson.build
2	+++ tests/examples/gtk/meson.build
3	@@ -1,5 +1,5 @@
4	executable('gtksink', 'gtksink.c',
5	- dependencies: [gst_dep, gtk_dep, optional_deps],
6	+ dependencies: [gst_dep, gtk_dep, gtk_optional_deps],
7	c_args: gst_plugins_good_args,
8	include_directories: [configinc],
9	install: false)




--- docs/gst_plugins_cache.json.orig	2022-06-15 22:36:22 UTC
+++ docs/gst_plugins_cache.json
@@ -7087,10 +7087,10 @@
         "url": "Unknown package origin"
     },
     "gtk": {
-        "description": "Gtk+ sink",
+        "description": "GTK sink",
         "elements": {
             "gtkglsink": {
-                "author": "Matthew Waters <matthew@centricular.com>",
+                "author": "Matthew Waters <matthew@centricular.com>, Rafał Dzięgiel <rafostar.github@gmail.com>",
                 "description": "A video sink that renders to a GtkWidget using OpenGL",
                 "hierarchy": [
                     "GstGtkGLSink",
@@ -7106,7 +7106,7 @@
                     "GstNavigation"
                 ],
                 "klass": "Sink/Video",
-                "long-name": "Gtk GL Video Sink",
+                "long-name": "GTK GL Video Sink",
                 "pad-templates": {
                     "sink": {
                         "caps": "video/x-raw(memory:GLMemory):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n\nvideo/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
@@ -7147,7 +7147,7 @@
                     "GstNavigation"
                 ],
                 "klass": "Sink/Video",
-                "long-name": "Gtk Video Sink",
+                "long-name": "GTK Video Sink",
                 "pad-templates": {
                     "sink": {
                         "caps": "video/x-raw:\n         format: { BGRx, BGRA }\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
@@ -7224,6 +7224,127 @@
                         "default": "0/1",
                         "max": "2147483647/1",
                         "min": "0/2147483647",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GstFraction",
+                        "writable": true
+                    },
+                    "widget": {
+                        "blurb": "The GtkWidget to place in the widget hierarchy (must only be get from the GTK main thread)",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "GtkWidget",
+                        "writable": false
+                    }
+                }
+            }
+        },
+        "package": "GStreamer Good Plug-ins",
+        "source": "gst-plugins-good",
+        "tracers": {},
+        "url": "Unknown package origin"
+    },
+    "gtk4": {
+        "description": "GTK4 sink",
+        "elements": {
+            "gtk4glsink": {
+                "author": "Matthew Waters <matthew@centricular.com>, Rafał Dzięgiel <rafostar.github@gmail.com>",
+                "description": "A video sink that renders to a GtkWidget using OpenGL",
+                "hierarchy": [
+                    "GstGtkGLSink",
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "klass": "Sink/Video",
+                "long-name": "GTK4 GL Video Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw(memory:GLMemory):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n\nvideo/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition):\n         format: RGBA\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            },
+            "gtk4sink": {
+                "author": "Matthew Waters <matthew@centricular.com>",
+                "description": "A video sink that renders to a GtkWidget",
+                "hierarchy": [
+                    "GstGtkSink",
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "klass": "Sink/Video",
+                "long-name": "GTK4 Video Sink",
+                "pad-templates": {
+                    "sink": {
+                        "caps": "video/x-raw:\n         format: { BGRx, BGRA }\n          width: [ 1, 2147483647 ]\n         height: [ 1, 2147483647 ]\n      framerate: [ 0/1, 2147483647/1 ]\n",
+                        "direction": "sink",
+                        "presence": "always"
+                    }
+                },
+                "rank": "none"
+            }
+        },
+        "filename": "gstgtk4",
+        "license": "LGPL",
+        "other-types": {
+            "GstGtkBaseSink": {
+                "hierarchy": [
+                    "GstGtkBaseSink",
+                    "GstVideoSink",
+                    "GstBaseSink",
+                    "GstElement",
+                    "GstObject",
+                    "GInitiallyUnowned",
+                    "GObject"
+                ],
+                "interfaces": [
+                    "GstNavigation"
+                ],
+                "kind": "object",
+                "properties": {
+                    "force-aspect-ratio": {
+                        "blurb": "When enabled, scaling will respect original aspect ratio",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "true",
+                        "mutable": "null",
+                        "readable": true,
+                        "type": "gboolean",
+                        "writable": true
+                    },
+                    "pixel-aspect-ratio": {
+                        "blurb": "The pixel aspect ratio of the device",
+                        "conditionally-available": false,
+                        "construct": false,
+                        "construct-only": false,
+                        "controllable": false,
+                        "default": "0/1",
+                        "max": "2147483647/1",
+                        "min": "0/1",
                         "mutable": "null",
                         "readable": true,
                         "type": "GstFraction",




--- ext/gtk/gstgtkbasesink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -80,7 +81,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstGtkBaseSink, gst_
     G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION,
         gst_gtk_base_sink_navigation_interface_init);
     GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_sink,
-        "gtkbasesink", 0, "Gtk Video Sink base class"));
+        "gtkbasesink", 0, "GTK Video Sink base class"));
 
 
 static void
@@ -100,7 +101,7 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
   gobject_class->get_property = gst_gtk_base_sink_get_property;
 
   g_object_class_install_property (gobject_class, PROP_WIDGET,
-      g_param_spec_object ("widget", "Gtk Widget",
+      g_param_spec_object ("widget", "GTK Widget",
           "The GtkWidget to place in the widget hierarchy "
           "(must only be get from the GTK main thread)",
           GTK_TYPE_WIDGET,
@@ -135,10 +136,13 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl
           G_MAXINT, G_MAXINT, 1, DEFAULT_VIDEO_PAR_N, DEFAULT_VIDEO_PAR_D,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+  /* Disabling alpha was removed in GTK4 */
+#if !defined(BUILD_FOR_GTK4)
   g_object_class_install_property (gobject_class, PROP_IGNORE_ALPHA,
       g_param_spec_boolean ("ignore-alpha", "Ignore Alpha",
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#endif
 
   gobject_class->finalize = gst_gtk_base_sink_finalize;
 
@@ -169,6 +173,8 @@ gst_gtk_base_sink_finalize (GObject * object)
 {
   GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object);
 
+  GST_DEBUG ("finalizing base sink");
+
   GST_OBJECT_LOCK (gtk_sink);
   if (gtk_sink->window && gtk_sink->window_destroy_id)
     g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id);
@@ -193,6 +199,14 @@ static void
 window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink)
 {
   GST_OBJECT_LOCK (gtk_sink);
+  if (gtk_sink->widget) {
+    if (gtk_sink->widget_destroy_id) {
+      g_signal_handler_disconnect (gtk_sink->widget,
+          gtk_sink->widget_destroy_id);
+      gtk_sink->widget_destroy_id = 0;
+    }
+    g_clear_object (&gtk_sink->widget);
+  }
   gtk_sink->window = NULL;
   GST_OBJECT_UNLOCK (gtk_sink);
 }
@@ -205,7 +219,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
 
   /* Ensure GTK is initialized, this has no side effect if it was already
    * initialized. Also, we do that lazily, so the application can be first */
-  if (!gtk_init_check (NULL, NULL)) {
+  if (!gtk_init_check (
+#if !defined(BUILD_FOR_GTK4)
+          NULL, NULL
+#endif
+      )) {
     GST_INFO_OBJECT (gtk_sink, "Could not ensure GTK initialization.");
     return NULL;
   }
@@ -224,9 +242,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin
       g_object_bind_property (gtk_sink, "video-aspect-ratio-override",
       gtk_sink->widget, "video-aspect-ratio-override",
       G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#if !defined(BUILD_FOR_GTK4)
   gtk_sink->bind_ignore_alpha =
       g_object_bind_property (gtk_sink, "ignore-alpha", gtk_sink->widget,
       "ignore-alpha", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+#endif
 
   /* Take the floating ref, other wise the destruction of the container will
    * make this widget disappear possibly before we are done. */
@@ -372,6 +392,9 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
   GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink);
   GtkWidget *toplevel;
+#if defined(BUILD_FOR_GTK4)
+  GtkRoot *root;
+#endif
 
   if (gst_gtk_base_sink_get_widget (gst_sink) == NULL) {
     GST_ERROR_OBJECT (bsink, "Could not ensure GTK initialization.");
@@ -380,19 +403,47 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink)
 
   /* After this point, gtk_sink->widget will always be set */
 
+#if defined(BUILD_FOR_GTK4)
+  root = gtk_widget_get_root (GTK_WIDGET (gst_sink->widget));
+  if (!GTK_IS_ROOT (root)) {
+    GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gst_sink->widget));
+    if (parent) {
+      GtkWidget *temp_parent;
+      while ((temp_parent = gtk_widget_get_parent (parent)))
+        parent = temp_parent;
+    }
+    toplevel = (parent) ? parent : GTK_WIDGET (gst_sink->widget);
+#else
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gst_sink->widget));
   if (!gtk_widget_is_toplevel (toplevel)) {
+#endif
     /* sanity check */
     g_assert (klass->window_title);
 
     /* User did not add widget its own UI, let's popup a new GtkWindow to
      * make gst-launch-1.0 work. */
-    gst_sink->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gst_sink->window = gtk_window_new (
+#if !defined(BUILD_FOR_GTK4)
+        GTK_WINDOW_TOPLEVEL
+#endif
+        );
     gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480);
     gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title);
-    gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel);
-    gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy",
-        G_CALLBACK (window_destroy_cb), gst_sink);
+
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_set_child (GTK_WINDOW (
+#else
+    gtk_container_add (GTK_CONTAINER (
+#endif
+            gst_sink->window), toplevel);
+
+    gst_sink->window_destroy_id = g_signal_connect (
+#if defined(BUILD_FOR_GTK4)
+        GTK_WINDOW (gst_sink->window),
+#else
+        gst_sink->window,
+#endif
+        "destroy", G_CALLBACK (window_destroy_cb), gst_sink);
   }
 
   return TRUE;
@@ -411,7 +462,11 @@ gst_gtk_base_sink_stop_on_main (GstBaseSink * bsink)
   GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink);
 
   if (gst_sink->window) {
+#if defined(BUILD_FOR_GTK4)
+    gtk_window_destroy (GTK_WINDOW (gst_sink->window));
+#else
     gtk_widget_destroy (gst_sink->window);
+#endif
     gst_sink->window = NULL;
     gst_sink->widget = NULL;
   }
@@ -432,10 +487,14 @@ gst_gtk_base_sink_stop (GstBaseSink * bsink)
 }
 
 static void
-gst_gtk_widget_show_all_and_unref (GtkWidget * widget)
+gst_gtk_window_show_all_and_unref (GtkWidget * window)
 {
-  gtk_widget_show_all (widget);
-  g_object_unref (widget);
+#if defined(BUILD_FOR_GTK4)
+  gtk_window_present (GTK_WINDOW (window));
+#else
+  gtk_widget_show_all (window);
+#endif
+  g_object_unref (window);
 }
 
 static GstStateChangeReturn
@@ -463,7 +522,7 @@ gst_gtk_base_sink_change_state (GstElement * element, 
       GST_OBJECT_UNLOCK (gtk_sink);
 
       if (window)
-        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_widget_show_all_and_unref,
+        gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_window_show_all_and_unref,
             window);
 
       break;




--- ext/gtk/gstgtkbasesink.h.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkbasesink.h
@@ -51,14 +51,14 @@ GType gst_gtk_base_sink_get_type (void);
 struct _GstGtkBaseSink
 {
   /* <private> */
-  GstVideoSink         parent;
+  GstVideoSink          parent;
 
-  GstVideoInfo         v_info;
+  GstVideoInfo          v_info;
 
   GtkGstBaseWidget     *widget;
 
   /* properties */
-  gboolean             force_aspect_ratio;
+  gboolean              force_aspect_ratio;
   GBinding             *bind_aspect_ratio;
 
   gint                  par_n;
@@ -73,8 +73,8 @@ struct _GstGtkBaseSink
   GBinding             *bind_ignore_alpha;
 
   GtkWidget            *window;
-  gulong               widget_destroy_id;
-  gulong               window_destroy_id;
+  gulong                widget_destroy_id;
+  gulong                window_destroy_id;
 };
 
 /**




--- ext/gtk/gstgtkglsink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtkglsink.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -23,6 +24,11 @@
  * @title: gtkglsink
  */
 
+/**
+ * SECTION:element-gtk4glsink
+ * @title: gtk4glsink
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -30,6 +36,7 @@
 #include <gst/gl/gstglfuncs.h>
 #include <gst/video/gstvideoaffinetransformationmeta.h>
 
+#include "gtkconfig.h"
 #include "gstgtkglsink.h"
 #include "gtkgstglwidget.h"
 
@@ -65,7 +72,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template =
 #define gst_gtk_gl_sink_parent_class parent_class
 G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink,
     GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink,
-        "gtkglsink", 0, "Gtk GL Video Sink"));
+        GTKCONFIG_GLSINK, 0, GTKCONFIG_NAME " GL Video Sink"));
 GST_ELEMENT_REGISTER_DEFINE (gtkglsink, "gtkglsink", GST_RANK_NONE,
     GST_TYPE_GTK_GL_SINK);
 
@@ -101,7 +108,7 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
   gstbasesink_class->event = gst_gtk_gl_sink_event;
 
   gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new;
-  gstgtkbasesink_class->window_title = "Gtk+ GL renderer";
+  gstgtkbasesink_class->window_title = GTKCONFIG_NAME " GL Renderer";
 
   /**
    * gtkglsink:rotate-method:
@@ -117,9 +124,11 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass)
           GST_TYPE_VIDEO_ORIENTATION_METHOD, GST_VIDEO_ORIENTATION_IDENTITY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " GL Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL",
-      "Matthew Waters <matthew@centricular.com>");
+      "Matthew Waters <matthew@centricular.com>, "
+      "Rafał Dzięgiel <rafostar.github@gmail.com>");
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_gtk_gl_sink_template);
@@ -202,16 +211,18 @@ gst_gtk_gl_sink_query (GstBaseSink * bsink, GstQuery *
 }
 
 static void
-_size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle,
-    GstGtkGLSink * gtk_sink)
+_size_changed_cb (GtkWidget * widget, gint width,
+    gint height, GstGtkGLSink * gtk_sink)
 {
-  gint scale_factor, width, height;
   gboolean reconfigure;
 
-  scale_factor = gtk_widget_get_scale_factor (widget);
-  width = scale_factor * gtk_widget_get_allocated_width (widget);
-  height = scale_factor * gtk_widget_get_allocated_height (widget);
+  GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
 
+  /* Ignore size changes before widget is negotiated
+   * we are going to queue a resize after negotiation */
+  if (!base_widget->negotiated)
+    return;
+
   GST_OBJECT_LOCK (gtk_sink);
   reconfigure =
       (width != gtk_sink->display_width || height != gtk_sink->display_height);
@@ -220,7 +231,7 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
   GST_OBJECT_UNLOCK (gtk_sink);
 
   if (reconfigure) {
-    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad.");
+    GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad");
     gst_pad_push_event (GST_BASE_SINK (gtk_sink)->sinkpad,
         gst_event_new_reconfigure ());
   }
@@ -229,9 +240,9 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r
 static void
 destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink)
 {
-  if (gtk_sink->size_allocate_sig_handler) {
-    g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (widget, gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {
@@ -254,29 +265,34 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink)
   gst_widget = GTK_GST_GL_WIDGET (base_sink->widget);
 
   /* Track the allocation size */
-  gtk_sink->size_allocate_sig_handler =
-      g_signal_connect (gst_widget, "size-allocate",
-      G_CALLBACK (_size_changed_cb), gtk_sink);
+  if (!gtk_sink->widget_resize_sig_handler) {
+    gtk_sink->widget_resize_sig_handler =
+        g_signal_connect (gst_widget, "resize",
+        G_CALLBACK (_size_changed_cb), gtk_sink);
+  }
 
-  gtk_sink->widget_destroy_sig_handler =
-      g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
-      gtk_sink);
+  if (!gtk_sink->widget_destroy_sig_handler) {
+    gtk_sink->widget_destroy_sig_handler =
+        g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb),
+        gtk_sink);
+  }
 
-  _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink);
-
   if (!gtk_gst_gl_widget_init_winsys (gst_widget)) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to initialize OpenGL with Gtk"), (NULL));
+            "Failed to initialize OpenGL with GTK"), (NULL));
     return FALSE;
   }
 
-  gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
-  gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
-  gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
+  if (!gtk_sink->display)
+    gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget);
+  if (!gtk_sink->context)
+    gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget);
+  if (!gtk_sink->gtk_context)
+    gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget);
 
   if (!gtk_sink->display || !gtk_sink->context || !gtk_sink->gtk_context) {
     GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s",
-            "Failed to retrieve OpenGL context from Gtk"), (NULL));
+            "Failed to retrieve OpenGL context from GTK"), (NULL));
     return FALSE;
   }
 
@@ -290,7 +306,14 @@ static gboolean
 gst_gtk_gl_sink_stop (GstBaseSink * bsink)
 {
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (bsink);
+  GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (bsink);
 
+  if (gtk_sink->widget_resize_sig_handler) {
+    g_signal_handler_disconnect (base_sink->widget,
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
+  }
+
   if (gtk_sink->display) {
     gst_object_unref (gtk_sink->display);
     gtk_sink->display = NULL;
@@ -432,10 +455,10 @@ gst_gtk_gl_sink_finalize (GObject * object)
   GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object);
   GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object);
 
-  if (gtk_sink->size_allocate_sig_handler) {
+  if (gtk_sink->widget_resize_sig_handler) {
     g_signal_handler_disconnect (base_sink->widget,
-        gtk_sink->size_allocate_sig_handler);
-    gtk_sink->size_allocate_sig_handler = 0;
+        gtk_sink->widget_resize_sig_handler);
+    gtk_sink->widget_resize_sig_handler = 0;
   }
 
   if (gtk_sink->widget_destroy_sig_handler) {

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files5/patch-ext_gtk_gstgtkglsink.h (+11 lines)
1	--- ext/gtk/gstgtkglsink.h
2	+++ ext/gtk/gstgtkglsink.h
3	@@ -57,7 +57,7 @@ struct _GstGtkGLSink
4	gint display_width;
5	gint display_height;
6
7	- gulong size_allocate_sig_handler;
8	+ gulong widget_resize_sig_handler;
9	gulong widget_destroy_sig_handler;
10	};
11




--- ext/gtk/gstgtksink.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstgtksink.c
@@ -19,15 +19,22 @@
  */
 
 /**
- * SECTION:element-gtkgstsink
- * @title: gtkgstsink
+ * SECTION:element-gtksink
+ * @title: gtksink
  *
  */
 
+/**
+ * SECTION:element-gtk4sink
+ * @title: gtk4sink
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gtkgstwidget.h"
 #include "gstgtksink.h"
 
@@ -64,9 +71,10 @@ gst_gtk_sink_class_init (GstGtkSinkClass * klass)
   base_class = (GstGtkBaseSinkClass *) klass;
 
   base_class->create_widget = gtk_gst_widget_new;
-  base_class->window_title = "Gtk+ Cairo renderer";
+  base_class->window_title = GTKCONFIG_NAME " Cairo Renderer";
 
-  gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink",
+  gst_element_class_set_metadata (gstelement_class,
+      GTKCONFIG_NAME " Video Sink",
       "Sink/Video", "A video sink that renders to a GtkWidget",
       "Matthew Waters <matthew@centricular.com>");
 




--- ext/gtk/gstplugin.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gstplugin.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -22,8 +23,10 @@
 #include "config.h"
 #endif
 
+#include "gtkconfig.h"
 #include "gstgtksink.h"
-#if defined(HAVE_GTK3_GL)
+
+#if defined(HAVE_GTK_GL)
 #include "gstgtkglsink.h"
 #endif
 
@@ -32,10 +35,10 @@ plugin_init (GstPlugin * plugin)
 {
   gboolean ret = FALSE;
 
-  ret |= GST_ELEMENT_REGISTER (gtksink, plugin);
+  ret |= GST_ELEMENT_REGISTER (GTKCONFIG_SINK, plugin);
 
-#if defined(HAVE_GTK3_GL)
-  ret |= GST_ELEMENT_REGISTER (gtkglsink, plugin);
+#if defined(HAVE_GTK_GL)
+  ret |= GST_ELEMENT_REGISTER (GTKCONFIG_GLSINK, plugin);
 #endif
 
   return ret;
@@ -43,7 +46,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gtk,
-    "Gtk+ sink",
+    GTKCONFIG_PLUGIN, GTKCONFIG_NAME " sink",
     plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)




--- /dev/null
+++ ext/gtk/gtkconfig.h
@@ -0,0 +1,31 @@
+/*
+ * GStreamer
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#if defined(BUILD_FOR_GTK4)
+#define GTKCONFIG_PLUGIN gtk4
+#define GTKCONFIG_NAME "GTK4"
+#define GTKCONFIG_SINK "gtk4sink"
+#define GTKCONFIG_GLSINK "gtk4glsink"
+#else
+#define GTKCONFIG_PLUGIN gtk
+#define GTKCONFIG_NAME "GTK"
+#define GTKCONFIG_SINK "gtksink"
+#define GTKCONFIG_GLSINK "gtkglsink"
+#endif




--- ext/gtk/gtkgstbasewidget.c.orig	2022-06-15 22:36:22 UTC
+++ ext/gtk/gtkgstbasewidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -208,7 +209,23 @@ gtk_gst_base_widget_get_preferred_height (GtkWidget * 
     *natural = video_height;
 }
 
+#if defined(BUILD_FOR_GTK4)
 static void
+gtk_gst_base_widget_measure (GtkWidget * widget, GtkOrientation orientation,
+    gint for_size, gint * min, gint * natural,
+    gint * minimum_baseline, gint * natural_baseline)
+{
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    gtk_gst_base_widget_get_preferred_width (widget, min, natural);
+  else
+    gtk_gst_base_widget_get_preferred_height (widget, min, natural);
+
+  *minimum_baseline = -1;
+  *natural_baseline = -1;
+}
+#endif
+
+static void
 gtk_gst_base_widget_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec)
 {
@@ -281,22 +298,46 @@ _gdk_key_to_navigation_string (guint keyval)
   }
 }
 
+static GdkEvent *
+_get_current_event (GtkEventController * controller)
+{
+#if defined(BUILD_FOR_GTK4)
+  return gtk_event_controller_get_current_event (controller);
+#else
+  return gtk_get_current_event ();
+#endif
+}
+
+static void
+_gdk_event_free (GdkEvent * event)
+{
+#if !defined(BUILD_FOR_GTK4)
+  if (event)
+    gdk_event_free (event);
+#endif
+}
+
 static gboolean
-gtk_gst_base_widget_key_event (GtkWidget * widget, GdkEventKey * event)
+gtk_gst_base_widget_key_event (GtkEventControllerKey * key_controller,
+    guint keyval, guint keycode, GdkModifierType state)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (key_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
-      const gchar *str = _gdk_key_to_navigation_string (event->keyval);
-      const gchar *key_type =
-          event->type == GDK_KEY_PRESS ? "key-press" : "key-release";
+      GdkEvent *event = _get_current_event (controller);
+      const gchar *str = _gdk_key_to_navigation_string (keyval);
 
-      if (!str)
-        str = event->string;
-
-      gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      if (str) {
+        const gchar *key_type =
+            gdk_event_get_event_type (event) ==
+            GDK_KEY_PRESS ? "key-press" : "key-release";
+        gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str);
+      }
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -371,18 +412,38 @@ gtk_gst_base_widget_display_size_to_stream_size (GtkGs
 }
 
 static gboolean
-gtk_gst_base_widget_button_event (GtkWidget * widget, GdkEventButton * event)
+gtk_gst_base_widget_button_event (
+#if defined(BUILD_FOR_GTK4)
+    GtkGestureClick * gesture,
+#else
+    GtkGestureMultiPress * gesture,
+#endif
+    gint n_press, gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (gesture);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
+      GdkEvent *event = _get_current_event (controller);
       const gchar *key_type =
-          event->type ==
-          GDK_BUTTON_PRESS ? "mouse-button-press" : "mouse-button-release";
+          gdk_event_get_event_type (event) == GDK_BUTTON_PRESS
+          ? "mouse-button-press" : "mouse-button-release";
+#if !defined(BUILD_FOR_GTK4)
+      guint button;
+      gdk_event_get_button (event, &button);
+#endif
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), key_type,
-          event->button, event->x, event->y);
+#if defined(BUILD_FOR_GTK4)
+          /* Gesture is set to ignore other buttons so we do not have to check */
+          GDK_BUTTON_PRIMARY,
+#else
+          button,
+#endif
+          event->x, event->y);
+      _gdk_event_free (event);
     }
     g_object_unref (element);
   }
@@ -391,15 +452,18 @@ gtk_gst_base_widget_button_event (GtkWidget * widget, 
 }
 
 static gboolean
-gtk_gst_base_widget_motion_event (GtkWidget * widget, GdkEventMotion * event)
+gtk_gst_base_widget_motion_event (GtkEventControllerMotion * motion_controller,
+    gdouble x, gdouble y)
 {
+  GtkEventController *controller = GTK_EVENT_CONTROLLER (motion_controller);
+  GtkWidget *widget = gtk_event_controller_get_widget (controller);
   GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget);
   GstElement *element;
 
   if ((element = g_weak_ref_get (&base_widget->element))) {
     if (GST_IS_NAVIGATION (element)) {
       gst_navigation_send_mouse_event (GST_NAVIGATION (element), "mouse-move",
-          0, event->x, event->y);
+          0, x, y);
     }
     g_object_unref (element);
   }
@@ -490,24 +554,20 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass 
           "When enabled, alpha will be ignored and converted to black",
           DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
+#if defined(BUILD_FOR_GTK4)
+  widget_klass->measure = gtk_gst_base_widget_measure;
+#else
   widget_klass->get_preferred_width = gtk_gst_base_widget_get_preferred_width;
   widget_klass->get_preferred_height = gtk_gst_base_widget_get_preferred_height;
-  widget_klass->key_press_event = gtk_gst_base_widget_key_event;
-  widget_klass->key_release_event = gtk_gst_base_widget_key_event;
-  widget_klass->button_press_event = gtk_gst_base_widget_button_event;
-  widget_klass->button_release_event = gtk_gst_base_widget_button_event;
-  widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event;
-  widget_klass->scroll_event = gtk_gst_base_widget_scroll_event;
+#endif
 
   GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0,
-      "Gtk Video Base Widget");
+      "GTK Video Base Widget");
 }
 
 void
 gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
 {
-  int event_mask;
-
   widget->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO;
   widget->par_n = DEFAULT_DISPLAY_PAR_N;
   widget->par_d = DEFAULT_DISPLAY_PAR_D;
@@ -521,20 +581,66 @@ gtk_gst_base_widget_init (GtkGstBaseWidget * widget)
   g_weak_ref_init (&widget->element, NULL);
   g_mutex_init (&widget->lock);
 
+  widget->key_controller = gtk_event_controller_key_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->key_controller, "key-pressed",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+  g_signal_connect (widget->key_controller, "key-released",
+      G_CALLBACK (gtk_gst_base_widget_key_event), NULL);
+
+  widget->motion_controller = gtk_event_controller_motion_new (
+#if !defined(BUILD_FOR_GTK4)
+      GTK_WIDGET (widget)
+#endif
+      );
+  g_signal_connect (widget->motion_controller, "motion",
+      G_CALLBACK (gtk_gst_base_widget_motion_event), NULL);
+
+  widget->click_gesture =
+#if defined(BUILD_FOR_GTK4)
+      gtk_gesture_click_new ();
+#else
+      gtk_gesture_multi_press_new (GTK_WIDGET (widget));
+#endif
+  g_signal_connect (widget->click_gesture, "pressed",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+  g_signal_connect (widget->click_gesture, "released",
+      G_CALLBACK (gtk_gst_base_widget_button_event), NULL);
+
+#if defined(BUILD_FOR_GTK4)
+  /* Otherwise widget in grid will appear as a 1x1px
+   * video which might be misleading for users */
+  gtk_widget_set_hexpand (GTK_WIDGET (widget), TRUE);
+  gtk_widget_set_vexpand (GTK_WIDGET (widget), TRUE);
+
+  gtk_widget_set_focusable (GTK_WIDGET (widget), TRUE);
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (widget->click_gesture),
+      GDK_BUTTON_PRIMARY);
+
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->key_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget), widget->motion_controller);
+  gtk_widget_add_controller (GTK_WIDGET (widget),
+      GTK_EVENT_CONTROLLER (widget->click_gesture));
+#endif
+
   gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE);
-  event_mask = gtk_widget_get_events (GTK_WIDGET (widget));
-  event_mask |= GDK_KEY_PRESS_MASK
-      | GDK_KEY_RELEASE_MASK
-      | GDK_BUTTON_PRESS_MASK
-      | GDK_BUTTON_RELEASE_MASK
-      | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_SCROLL_MASK;
-  gtk_widget_set_events (GTK_WIDGET (widget), event_mask);
 }
 
 void
 gtk_gst_base_widget_finalize (GObject * object)
 {
   GtkGstBaseWidget *widget = GTK_GST_BASE_WIDGET (object);
+
+  /* GTK4 takes ownership of EventControllers
+   * while GTK3 still needs manual unref */
+#if !defined(BUILD_FOR_GTK4)
+  g_object_unref (widget->key_controller);
+  g_object_unref (widget->motion_controller);
+  g_object_unref (widget->click_gesture);
+#endif
 
   gst_buffer_replace (&widget->pending_buffer, NULL);
   gst_buffer_replace (&widget->buffer, NULL);




--- ext/gtk/gtkgstbasewidget.h
+++ ext/gtk/gtkgstbasewidget.h
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -25,6 +26,10 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
+#if !defined(BUILD_FOR_GTK4)
+#include <gdk/gdk.h>
+#endif
+
 #define GTK_GST_BASE_WIDGET(w)         ((GtkGstBaseWidget *)(w))
 #define GTK_GST_BASE_WIDGET_CLASS(k)   ((GtkGstBaseWidgetClass *)(k))
 #define GTK_GST_BASE_WIDGET_LOCK(w)    g_mutex_lock(&((GtkGstBaseWidget*)(w))->lock)
@@ -39,9 +44,7 @@ struct _GtkGstBaseWidget
 {
   union {
     GtkDrawingArea drawing_area;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLArea gl_area;
-#endif
   } parent;
 
   /* properties */
@@ -67,6 +70,11 @@ struct _GtkGstBaseWidget
   GMutex lock;
   GWeakRef element;
 
+  /* event controllers */
+  GtkEventController *key_controller;
+  GtkEventController *motion_controller;
+  GtkGesture *click_gesture;
+
   /* Pending draw idles callback */
   guint draw_id;
 };
@@ -75,9 +83,7 @@ struct _GtkGstBaseWidgetClass
 {
   union {
     GtkDrawingAreaClass drawing_area_class;
-#if GTK_CHECK_VERSION(3, 15, 0)
     GtkGLAreaClass gl_area_class;
-#endif
   } parent_class;
 };
 




--- ext/gtk/gtkgstglwidget.c
+++ ext/gtk/gtkgstglwidget.c
@@ -1,6 +1,7 @@
 /*
  * GStreamer
  * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ * Copyright (C) 2020 Rafał Dzięgiel <rafostar.github@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,12 +31,20 @@
 #include <gst/video/video.h>
 
 #if GST_GL_HAVE_WINDOW_X11 && defined (GDK_WINDOWING_X11)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/x11/gdkx.h>
+#else
 #include <gdk/gdkx.h>
+#endif
 #include <gst/gl/x11/gstgldisplay_x11.h>
 #endif
 
 #if GST_GL_HAVE_WINDOW_WAYLAND && defined (GDK_WINDOWING_WAYLAND)
+#if defined(BUILD_FOR_GTK4)
+#include <gdk/wayland/gdkwayland.h>
+#else
 #include <gdk/gdkwayland.h>
+#endif
 #include <gst/gl/wayland/gstgldisplay_wayland.h>
 #endif
 
@@ -78,8 +87,7 @@ static const GLfloat vertices[] = {
 G_DEFINE_TYPE_WITH_CODE (GtkGstGLWidget, gtk_gst_gl_widget, GTK_TYPE_GL_AREA,
     G_ADD_PRIVATE (GtkGstGLWidget)
     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gtkgstglwidget", 0,
-        "Gtk Gst GL Widget");
-    );
+        "GTK Gst GL Widget"));
 
 static void
 gtk_gst_gl_widget_bind_buffer (GtkGstGLWidget * gst_widget)
@@ -407,8 +415,11 @@ gtk_gst_gl_widget_init (GtkGstGLWidget * gst_widget)
 
   GST_INFO ("Created %" GST_PTR_FORMAT, priv->display);
 
+  /* GTK4 always has alpha */
+#if !defined(BUILD_FOR_GTK4)
   gtk_gl_area_set_has_alpha (GTK_GL_AREA (gst_widget),
       !base_widget->ignore_alpha);
+#endif
 }
 
 static void




--- ext/gtk/gtkgstwidget.c
+++ ext/gtk/gtkgstwidget.c
@@ -38,17 +38,15 @@
 
 G_DEFINE_TYPE (GtkGstWidget, gtk_gst_widget, GTK_TYPE_DRAWING_AREA);
 
-static gboolean
-gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+static void
+_drawing_area_draw (GtkDrawingArea * da, cairo_t * cr,
+    gint widget_width, gint widget_height, gpointer data)
 {
+  GtkWidget *widget = GTK_WIDGET (da);
   GtkGstBaseWidget *gst_widget = (GtkGstBaseWidget *) widget;
-  guint widget_width, widget_height;
   cairo_surface_t *surface;
   GstVideoFrame frame;
 
-  widget_width = gtk_widget_get_allocated_width (widget);
-  widget_height = gtk_widget_get_allocated_height (widget);
-
   GTK_GST_BASE_WIDGET_LOCK (gst_widget);
 
   /* There is not much to optimize in term of redisplay, so simply swap the
@@ -148,7 +146,10 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
       color.alpha = 1.0;
     } else {
       gtk_style_context_get_color (gtk_widget_get_style_context (widget),
-          GTK_STATE_FLAG_NORMAL, &color);
+#if !defined(BUILD_FOR_GTK4)
+          GTK_STATE_FLAG_NORMAL,
+#endif
+          &color);
     }
     gdk_cairo_set_source_rgba (cr, &color);
     cairo_rectangle (cr, 0, 0, widget_width, widget_height);
@@ -156,8 +157,20 @@ gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
   }
 
   GTK_GST_BASE_WIDGET_UNLOCK (gst_widget);
+}
+
+#if !defined(BUILD_FOR_GTK4)
+static gboolean
+gtk_gst_widget_draw (GtkWidget * widget, cairo_t * cr)
+{
+  gint width = gtk_widget_get_allocated_width (widget);
+  gint height = gtk_widget_get_allocated_height (widget);
+
+  _drawing_area_draw (GTK_DRAWING_AREA (widget), cr, width, height, NULL);
+
   return FALSE;
 }
+#endif
 
 static void
 gtk_gst_widget_finalize (GObject * object)
@@ -171,17 +184,25 @@ static void
 gtk_gst_widget_class_init (GtkGstWidgetClass * klass)
 {
   GObjectClass *gobject_klass = (GObjectClass *) klass;
+#if !defined(BUILD_FOR_GTK4)
   GtkWidgetClass *widget_klass = (GtkWidgetClass *) klass;
+#endif
 
   gtk_gst_base_widget_class_init (GTK_GST_BASE_WIDGET_CLASS (klass));
   gobject_klass->finalize = gtk_gst_widget_finalize;
+#if !defined(BUILD_FOR_GTK4)
   widget_klass->draw = gtk_gst_widget_draw;
+#endif
 }
 
 static void
 gtk_gst_widget_init (GtkGstWidget * widget)
 {
   gtk_gst_base_widget_init (GTK_GST_BASE_WIDGET (widget));
+#if defined(BUILD_FOR_GTK4)
+  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (widget),
+      _drawing_area_draw, NULL, NULL);
+#endif
 }
 
 GtkWidget *




--- ext/gtk/meson.build
+++ ext/gtk/meson.build
@@ -1,3 +1,4 @@
+gtk_versions = [3, 4]
 gtk_sources = [
   'gstgtkbasesink.c',
   'gstgtksink.c',
@@ -6,54 +7,86 @@ gtk_sources = [
   'gtkgstbasewidget.c',
   'gtkgstwidget.c',
 ]
+gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
+gtk_optional_deps = []
 
-gtk_defines = []
-optional_deps = []
+gtk4_dep = dependency('gtk4', required : get_option('gtk4'))
+gtk4_optional_deps = []
 
-gtk_dep = dependency('gtk+-3.0', required : get_option('gtk3'))
-if gtk_dep.found()
-  # FIXME: automagic
-  if have_gstgl and gtk_dep.version().version_compare('>=3.15.0')
-    have_gtk3_gl_windowing = false
+foreach gtk_ver : gtk_versions
+  gtkv = 'gtk' + gtk_ver.to_string()
+
+  gtk_state = get_option(gtkv)
+  if gtk_state.disabled()
+    continue
+  endif
+
+  min_ver = gtk_ver >= 4 ? '3.99.2'          : '3.24.0'
+  x11_str = gtk_ver >= 4 ? gtkv + '-x11'     : 'gtk+-x11-3.0'
+  way_str = gtk_ver >= 4 ? gtkv + '-wayland' : 'gtk+-wayland-3.0'
+  lib_dep = gtk_ver >= 4 ? gtk4_dep          : gtk_dep
+
+  if not lib_dep.found() or not lib_dep.version().version_compare('>=' + min_ver)
+    continue
+  endif
+
+  lib_sources = []
+  gtk_defines = []
+  optional_deps = []
+  have_gtk_gl_windowing = false
 
+  lib_sources += gtk_sources
+
+  if have_gstgl
     if gst_gl_have_window_x11 and gst_gl_have_platform_glx
       # FIXME: automagic
-      gtk_x11_dep = dependency('gtk+-x11-3.0', required : false)
+      gtk_x11_dep = dependency(x11_str, required : false)
       if gtk_x11_dep.found()
         optional_deps += [gtk_x11_dep, gstglx11_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
 
     if gst_gl_have_window_wayland and gst_gl_have_platform_egl
       # FIXME: automagic
-      gtk_wayland_dep = dependency('gtk+-wayland-3.0', required : false)
+      gtk_wayland_dep = dependency(way_str, required : false)
       if gtk_wayland_dep.found()
         optional_deps += [gtk_wayland_dep, gstglegl_dep, gstglwayland_dep]
-        have_gtk3_gl_windowing = true
+        have_gtk_gl_windowing = true
       endif
     endif
+  endif
 
-    if have_gtk3_gl_windowing
-      gtk_sources += [
-        'gstgtkglsink.c',
-        'gtkgstglwidget.c',
-      ]
-      optional_deps += [gstgl_dep, gstglproto_dep]
-      gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK3_GL']
-    endif
+  if have_gtk_gl_windowing
+    lib_sources += [
+      'gstgtkglsink.c',
+      'gtkgstglwidget.c',
+    ]
+    optional_deps += [gstgl_dep, gstglproto_dep]
+    gtk_defines += ['-DGST_USE_UNSTABLE_API', '-DHAVE_GTK_GL']
+  endif
+
+  if gtk_ver == 3
+    gtk_optional_deps = optional_deps
+  elif gtk_ver == 4
+    gtk4_optional_deps = optional_deps
+    gtk_defines += '-DBUILD_FOR_GTK4'
+  endif
+
+  lib_name = 'gstgtk'
+  if gtk_ver > 3
+    lib_name += gtk_ver.to_string()
   endif
 
-  gstgtk = library('gstgtk',
-    gtk_sources,
+  gstgtk = library(lib_name,
+    lib_sources,
     c_args : gst_plugins_good_args + gtk_defines,
     link_args : noseh_link_args,
     include_directories : [configinc],
-    dependencies : [gtk_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
+    dependencies : [lib_dep, gstvideo_dep, gstbase_dep, libm] + optional_deps,
     install : true,
     install_dir : plugins_install_dir,
   )
   pkgconfig.generate(gstgtk, install_dir : plugins_pkgconfig_install_dir)
   plugins += [gstgtk]
-endif
-
+endforeach

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files5/patch-meson__options.txt (+10 lines)
1	--- meson_options.txt
2	+++ meson_options.txt
3	@@ -53,6 +53,7 @@ option('dv1394', type : 'feature', value : 'auto', description : 'Digital IEEE13
4	option('flac', type : 'feature', value : 'auto', description : 'FLAC audio codec plugin')
5	option('gdk-pixbuf', type : 'feature', value : 'auto', description : 'gdk-pixbuf image decoder, overlay, and sink plugin')
6	option('gtk3', type : 'feature', value : 'auto', description : 'GTK+ video sink plugin')
7	+option('gtk4', type : 'feature', value : 'disabled', description : 'GTK4 video sink plugin')
8	option('jack', type : 'feature', value : 'auto', description : 'JACK audio source/sink plugin')
9	option('jpeg', type : 'feature', value : 'auto', description : 'JPEG image codec plugin')
10	option('lame', type : 'feature', value : 'auto', description : 'LAME mp3 audio encoder plugin')

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-gtk4/files5/patch-tests_examples_gtk_meson.build (+9 lines)
1	--- tests/examples/gtk/meson.build
2	+++ tests/examples/gtk/meson.build
3	@@ -1,5 +1,5 @@
4	executable('gtksink', 'gtksink.c',
5	- dependencies: [gst_dep, gtk_dep, optional_deps],
6	+ dependencies: [gst_dep, gtk_dep, gtk_optional_deps],
7	c_args: gst_plugins_good_args,
8	include_directories: [configinc],
9	install: false)

Lines 8-11 DIST= base Link Here

(-)b/x11-toolkits/gstreamer1-plugins-pango/Makefile (+6 lines)
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		10
		11	PLIST= ${.CURDIR}/pkg-plist
		12
		13	USE_GNOME= cairo pango
		14	USES= xorg
		15	USE_XORG= x11 xext
		16
11	.include "${MASTERDIR}/Makefile"	17	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/x11-toolkits/gstreamer1-plugins-pango/pkg-plist (+1 lines)
1	lib/gstreamer-%%VERSION%%/libgstpango.so

Lines 4-11 CATEGORIES= x11 Link Here

(-)b/x11/gstreamer1-plugins-x/Makefile (+9 lines)
4	COMMENT= GStreamer X and Xvideo output plugins	4	COMMENT= GStreamer X and Xvideo output plugins
5		5
6	GST_PLUGIN= x	6	GST_PLUGIN= x
		7
		8	BASE_GST_ENABLED_PLUGINS= ximage \
		9	xvideo
7	DIST= base	10	DIST= base
8		11
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
10		13
		14	PLIST= ${.CURDIR}/pkg-plist
		15
		16	USES= xorg
		17	USE_XORG= x11 xv xext
		18	CONFIGURE_ARGS= -Dxvideo=enabled -Dxshm=enabled
		19
11	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/x11/gstreamer1-plugins-x/pkg-plist (+3 lines)
1	lib/gstreamer-%%VERSION%%/libgstximagesink.so
2	lib/gstreamer-%%VERSION%%/libgstxvimagesink.so
3

Lines 4-12 PKGNAMESUFFIX= 1-plugins-ximagesrc Link Here

(-)b/x11/gstreamer1-plugins-ximagesrc/Makefile (-1 / +11 lines)
4		4
5	COMMENT= GStreamer X source plugin	5	COMMENT= GStreamer X source plugin
6		6
7	GST_PLUGIN= x	7	GST_PLUGIN= ximagesrc
8	DIST= good	8	DIST= good
9		9
		10	GOOD_GST_ENABLED_PLUGINS= ximagesrc \
		11	ximagesrc-xshm \
		12	ximagesrc-xfixes \
		13	ximagesrc-xdamage
		14
10	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	15	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
11		16
		17	PLIST= ${.CURDIR}/pkg-plist
		18
		19	USES= xorg
		20	USE_XORG= x11 xfixes xdamage xext
		21
12	.include "${MASTERDIR}/Makefile"	22	.include "${MASTERDIR}/Makefile"

Added Link Here

(-)b/x11/gstreamer1-plugins-ximagesrc/pkg-plist (-1 / +1 lines)
0	-	1	lib/gstreamer-%%VERSION%%/libgstximagesrc.so

Return to bug 261585

Lines 6-18 COMMENT= GStreamer OpenMPT audio decoder plugin Link Here

(-)b/audio/gstreamer1-plugins-openmpt/Makefile (-6 / +3 lines)
6	GST_PLUGIN= openmpt	6	GST_PLUGIN= openmpt
7	DIST= bad	7	DIST= bad
8		8
9	OPENMPT_GST_DIRS= gst-libs/gst/audio
10
11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
12		10
13	pre-build:	11	PLIST= ${.CURDIR}/pkg-plist
14	.for dir in ${OPENMPT_GST_DIRS}	12
15	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})	13	LIB_DEPENDS= libopenmpt.so:audio/libopenmpt
16	.endfor
17		14
18	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 15-31 OPTIONS_DEFINE= WAYLAND Link Here

(-)b/graphics/gstreamer1-plugins-gl/Makefile (-9 / +20 lines)
15	OPTIONS_DEFAULT=WAYLAND	15	OPTIONS_DEFAULT=WAYLAND
16	OPTIONS_SUB= yes	16	OPTIONS_SUB= yes
17		17
18	WAYLAND_CONFIGURE_ENABLE= wayland	18	OPTIONS_UNSET= WAYLAND
		19
		20	GL_WINSYS= "x11,egl"
		21
		22	WAYLAND_VARS= gl_winsys+=",wayland"
19	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols	23	WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols
20	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland	24	WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland
21		25
22	pre-build:	26	USES= gl
23	.for dir in ${GL_GST_DIRS}	27	USE_GL= gl glu glesv2 egl
24	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})	28	USE_XORG+=x11 \
25	.endfor	29	xext \
26		30	xcb
27	post-install:	31	BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
28	${INSTALL_DATA} ${WRKSRC}/pkgconfig/gstreamer-gl.pc \	32	LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \
29	${STAGEDIR}${PREFIX}/libdata/pkgconfig/gstreamer-gl-1.0.pc	33	libpng16.so:graphics/png
		34
		35	MESON_ARGS+= -Dgl=enabled \
		36	-Dgl_winsys="${GL_WINSYS}" \
		37	-Dgl_api=opengl,gles2 \
		38	-Dgl_platform=glx,egl
		39
		40	GST_PLUGIN_DIR= gst-libs/gst/gl ext/gl
30		41
31	.include "${MASTERDIR}/Makefile"	42	.include "${MASTERDIR}/Makefile"

Lines 1-6 Link Here

(-)b/graphics/gstreamer1-plugins-gl/pkg-plist (-2 / +19 lines)
		1	include/gstreamer-%%VERSION%%/gst/gl/egl/egl.h
1	include/gstreamer-%%VERSION%%/gst/gl/egl/gstegl.h	2	include/gstreamer-%%VERSION%%/gst/gl/egl/gstegl.h
2	include/gstreamer-%%VERSION%%/gst/gl/egl/gsteglimage.h	3	include/gstreamer-%%VERSION%%/gst/gl/egl/gsteglimage.h
3	include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl.h	4	include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl.h
		5	include/gstreamer-%%VERSION%%/gst/gl/egl/gstgldisplay_egl_device.h
4	include/gstreamer-%%VERSION%%/gst/gl/egl/gstglmemoryegl.h	6	include/gstreamer-%%VERSION%%/gst/gl/egl/gstglmemoryegl.h
5	include/gstreamer-%%VERSION%%/gst/gl/gl-enumtypes.h	7	include/gstreamer-%%VERSION%%/gst/gl/gl-enumtypes.h
6	include/gstreamer-%%VERSION%%/gst/gl/gl-prelude.h	8	include/gstreamer-%%VERSION%%/gst/gl/gl-prelude.h
Lines 8-13 include/gstreamer-%%VERSION%%/gst/gl/gl.h Link Here
8	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/all_functions.h	10	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/all_functions.h
9	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/base.h	11	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/base.h
10	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/blending.h	12	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/blending.h
		13	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/buffer_storage.h
11	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/buffers.h	14	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/buffers.h
12	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/debug.h	15	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/debug.h
13	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/eglimage.h	16	include/gstreamer-%%VERSION%%/gst/gl/glprototypes/eglimage.h
Lines 26-35 include/gstreamer-%%VERSION%%/gst/gl/gstgl_fwd.h Link Here
26	include/gstreamer-%%VERSION%%/gst/gl/gstglapi.h	29	include/gstreamer-%%VERSION%%/gst/gl/gstglapi.h
27	include/gstreamer-%%VERSION%%/gst/gl/gstglbasefilter.h	30	include/gstreamer-%%VERSION%%/gst/gl/gstglbasefilter.h
28	include/gstreamer-%%VERSION%%/gst/gl/gstglbasememory.h	31	include/gstreamer-%%VERSION%%/gst/gl/gstglbasememory.h
		32	include/gstreamer-%%VERSION%%/gst/gl/gstglbasesrc.h
29	include/gstreamer-%%VERSION%%/gst/gl/gstglbuffer.h	33	include/gstreamer-%%VERSION%%/gst/gl/gstglbuffer.h
30	include/gstreamer-%%VERSION%%/gst/gl/gstglbufferpool.h	34	include/gstreamer-%%VERSION%%/gst/gl/gstglbufferpool.h
31	include/gstreamer-%%VERSION%%/gst/gl/gstglcolorconvert.h	35	include/gstreamer-%%VERSION%%/gst/gl/gstglcolorconvert.h
32	include/gstreamer-%%VERSION%%/gst/gl/gstglcontext.h	36	include/gstreamer-%%VERSION%%/gst/gl/gstglcontext.h
		37	include/gstreamer-%%VERSION%%/gst/gl/gstglcontextconfig.h
33	include/gstreamer-%%VERSION%%/gst/gl/gstgldebug.h	38	include/gstreamer-%%VERSION%%/gst/gl/gstgldebug.h
34	include/gstreamer-%%VERSION%%/gst/gl/gstgldisplay.h	39	include/gstreamer-%%VERSION%%/gst/gl/gstgldisplay.h
35	include/gstreamer-%%VERSION%%/gst/gl/gstglfeature.h	40	include/gstreamer-%%VERSION%%/gst/gl/gstglfeature.h
Lines 52-63 include/gstreamer-%%VERSION%%/gst/gl/gstglutils.h Link Here
52	include/gstreamer-%%VERSION%%/gst/gl/gstglviewconvert.h	57	include/gstreamer-%%VERSION%%/gst/gl/gstglviewconvert.h
53	include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h	58	include/gstreamer-%%VERSION%%/gst/gl/gstglwindow.h
54	%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h	59	%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/gstgldisplay_wayland.h
		60	%%WAYLAND%%include/gstreamer-%%VERSION%%/gst/gl/wayland/wayland.h
55	include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h	61	include/gstreamer-%%VERSION%%/gst/gl/x11/gstgldisplay_x11.h
56	lib/girepository-1.0/GstGL-%%VERSION%%.typelib	62	include/gstreamer-%%VERSION%%/gst/gl/x11/x11.h
		63	lib/girepository-%%VERSION%%/GstGL-%%VERSION%%.typelib
		64	lib/girepository-%%VERSION%%/GstGLEGL-%%VERSION%%.typelib
		65	%%WAYLAND%%lib/girepository-%%VERSION%%/GstGLWayland-%%VERSION%%.typelib
		66	lib/girepository-%%VERSION%%/GstGLX11-%%VERSION%%.typelib
57	lib/gstreamer-%%VERSION%%/include/gst/gl/gstglconfig.h	67	lib/gstreamer-%%VERSION%%/include/gst/gl/gstglconfig.h
58	lib/gstreamer-%%VERSION%%/libgstopengl.so	68	lib/gstreamer-%%VERSION%%/libgstopengl.so
59	lib/libgstgl-%%VERSION%%.so	69	lib/libgstgl-%%VERSION%%.so
60	lib/libgstgl-%%VERSION%%.so.0	70	lib/libgstgl-%%VERSION%%.so.0
61	lib/libgstgl-%%VERSION%%.so.%%SOVERSION%%	71	lib/libgstgl-%%VERSION%%.so.%%SOVERSION%%
62	libdata/pkgconfig/gstreamer-gl-%%VERSION%%.pc	72	libdata/pkgconfig/gstreamer-gl-%%VERSION%%.pc
63	share/gir-1.0/GstGL-%%VERSION%%.gir	73	libdata/pkgconfig/gstreamer-gl-egl-%%VERSION%%.pc
		74	libdata/pkgconfig/gstreamer-gl-prototypes-%%VERSION%%.pc
		75	%%WAYLAND%%libdata/pkgconfig/gstreamer-gl-wayland-%%VERSION%%.pc
		76	libdata/pkgconfig/gstreamer-gl-x11-%%VERSION%%.pc
		77	share/gir-%%VERSION%%/GstGL-%%VERSION%%.gir
		78	share/gir-%%VERSION%%/GstGLEGL-%%VERSION%%.gir
		79	%%WAYLAND%%share/gir-%%VERSION%%/GstGLWayland-%%VERSION%%.gir
		80	share/gir-%%VERSION%%/GstGLX11-%%VERSION%%.gir

Removed Link Here

(-)a/graphics/gstreamer1-plugins-openjpeg/files/patch-inc (-30 lines)
1	Put the openjpeg include directory first, so that <openjpeg.h> includes
2	$LOCALBASE/include/openjpeg-2.3/openjpeg.h instead of $LOCALBASE/include/openjpeg.h
3
4	--- ext/openjpeg/Makefile.in.orig 2018-09-16 22:05:02.688860000 +0300
5	+++ ext/openjpeg/Makefile.in 2018-09-16 22:05:11.316104000 +0300
6	@@ -861,21 +861,21 @@
7	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
8
9	libgstopenjpeg_la-gstopenjpegdec.lo: gstopenjpegdec.c
10	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' \|\| echo '$(srcdir)/'`gstopenjpegdec.c
11	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegdec.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' \|\| echo '$(srcdir)/'`gstopenjpegdec.c
12	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegdec.Plo
13	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpegdec.c' object='libgstopenjpeg_la-gstopenjpegdec.lo' libtool=yes @AMDEPBACKSLASH@
14	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
15	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegdec.lo `test -f 'gstopenjpegdec.c' \|\| echo '$(srcdir)/'`gstopenjpegdec.c
16
17	libgstopenjpeg_la-gstopenjpegenc.lo: gstopenjpegenc.c
18	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' \|\| echo '$(srcdir)/'`gstopenjpegenc.c
19	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpegenc.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' \|\| echo '$(srcdir)/'`gstopenjpegenc.c
20	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpegenc.Plo
21	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpegenc.c' object='libgstopenjpeg_la-gstopenjpegenc.lo' libtool=yes @AMDEPBACKSLASH@
22	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
23	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -c -o libgstopenjpeg_la-gstopenjpegenc.lo `test -f 'gstopenjpegenc.c' \|\| echo '$(srcdir)/'`gstopenjpegenc.c
24
25	libgstopenjpeg_la-gstopenjpeg.lo: gstopenjpeg.c
26	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' \|\| echo '$(srcdir)/'`gstopenjpeg.c
27	+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(OPENJPEG_CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstopenjpeg_la_CFLAGS) $(CFLAGS) -MT libgstopenjpeg_la-gstopenjpeg.lo -MD -MP -MF $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo -c -o libgstopenjpeg_la-gstopenjpeg.lo `test -f 'gstopenjpeg.c' \|\| echo '$(srcdir)/'`gstopenjpeg.c
28	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Tpo $(DEPDIR)/libgstopenjpeg_la-gstopenjpeg.Plo
29	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstopenjpeg.c' object='libgstopenjpeg_la-gstopenjpeg.lo' libtool=yes @AMDEPBACKSLASH@
30	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

Added Link Here

(-)b/graphics/gstreamer1-plugins-vulkan/pkg-plist (+53 lines)
1	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkapi.h
2	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbarrier.h
3	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbuffermemory.h
4	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkbufferpool.h
5	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandbuffer.h
6	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkcommandpool.h
7	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkconfig.h
8	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdebug.h
9	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorcache.h
10	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorpool.h
11	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdescriptorset.h
12	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdevice.h
13	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkdisplay.h
14	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkerror.h
15	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkfence.h
16	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkformat.h
17	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkfullscreenquad.h
18	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkhandle.h
19	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkhandlepool.h
20	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimagebufferpool.h
21	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimagememory.h
22	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkimageview.h
23	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkinstance.h
24	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkmemory.h
25	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkphysicaldevice.h
26	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkqueue.h
27	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkswapper.h
28	include/gstreamer-%%VERSION%%/gst/vulkan/gstvktrash.h
29	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkutils.h
30	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkvideofilter.h
31	include/gstreamer-%%VERSION%%/gst/vulkan/gstvkwindow.h
32	include/gstreamer-%%VERSION%%/gst/vulkan/vulkan-enumtypes.h
33	include/gstreamer-%%VERSION%%/gst/vulkan/vulkan-prelude.h
34	include/gstreamer-%%VERSION%%/gst/vulkan/vulkan.h
35	include/gstreamer-%%VERSION%%/gst/vulkan/vulkan_fwd.h
36	include/gstreamer-%%VERSION%%/gst/vulkan/wayland/gstvkdisplay_wayland.h
37	include/gstreamer-%%VERSION%%/gst/vulkan/wayland/wayland.h
38	include/gstreamer-%%VERSION%%/gst/wayland/wayland.h
39	lib/girepository-%%VERSION%%/GstVulkan-%%VERSION%%.typelib
40	lib/girepository-%%VERSION%%/GstVulkanWayland-%%VERSION%%.typelib
41	lib/gstreamer-%%VERSION%%/libgstvulkan.so
42	lib/gstreamer-%%VERSION%%/libgstwaylandsink.so
43	lib/libgstvulkan-%%VERSION%%.so
44	lib/libgstvulkan-%%VERSION%%.so.0
45	lib/libgstvulkan-%%VERSION%%.so.%%SOVERSION%%
46	lib/libgstwayland-%%VERSION%%.so
47	lib/libgstwayland-%%VERSION%%.so.0
48	lib/libgstwayland-%%VERSION%%.so.%%SOVERSION%%
49	libdata/pkgconfig/gstreamer-vulkan-%%VERSION%%.pc
50	libdata/pkgconfig/gstreamer-vulkan-wayland-%%VERSION%%.pc
51	libdata/pkgconfig/gstreamer-wayland-%%VERSION%%.pc
52	share/gir-%%VERSION%%/GstVulkan-%%VERSION%%.gir
53	share/gir-%%VERSION%%/GstVulkanWayland-%%VERSION%%.gir

Lines 1-29 Link Here

(-)b/multimedia/gstreamer1-editing-services/Makefile (-12 / +17 lines)
1	PORTNAME= gstreamer1-editing-services	1	PORTNAME= gstreamer1-editing-services
2	PORTVERSION= 1.16.3	2	PORTVERSION= 1.20.3
3	CATEGORIES= multimedia	3	CATEGORIES= multimedia
4	MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer-editing-services/	4	MASTER_SITES= https://gstreamer.freedesktop.org/src/gstreamer-editing-services/
5	DISTNAME= gstreamer-editing-services-${PORTVERSION}	5	DISTNAME= gst-editing-services-${PORTVERSION}
6		6
7	MAINTAINER= multimedia@FreeBSD.org	7	MAINTAINER= multimedia@FreeBSD.org
8	COMMENT= GStreamer editing services	8	COMMENT= GStreamer editing services
9		9
10	LICENSE= LGPL20	10	LICENSE= LGPL20
11		11
12	USES= compiler:c11 gnome gstreamer meson python pkgconfig tar:xz	12	USES= bison compiler:c11 gnome gstreamer meson ninja python:3.8+,build pkgconfig shebangfix tar:xz
13	USE_LDCONFIG= yes	13	USE_LDCONFIG= yes
14	USE_GNOME= glib20 introspection:build libxml2 pygobject3:build	14	USE_GNOME= glib20 introspection:build libxml2 pygobject3:build
15	USE_GSTREAMER= good bad	15	USE_GSTREAMER= good bad
16	LIB_DEPENDS+= libgstvalidate-1.0.so:multimedia/gstreamer1-validate	16	LIB_DEPENDS+= libgstvalidate-1.0.so:multimedia/gstreamer1-validate \
		17	libpython3.9.so:lang/python39
17	PORTSCOUT= limitw:1,even	18	PORTSCOUT= limitw:1,even
18		19
19	CONFIGURE_ARGS= -D gtk_doc=disabled \	20	CONFIGURE_ARGS= -Ddoc=disabled \
20	-D introspection=enabled \	21	-Dintrospection=enabled \
21	-D pygi-overrides-dir=${PYTHON_SITELIBDIR}/gstreamer-editing-services	22	-Dpygi-overrides-dir=${PYTHON_SITELIBDIR}/gstreamer-editing-services
22	PLIST_SUB= VERSION=1.0 SOVERSION=0.1603.0	23	PLIST_SUB= VERSION=1.0 SOVERSION=0.2003.0
		24
		25	SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
		26	python_OLD_CMD= "/usr/bin/env python3"
		27	python_CMD= ${SETENV} ${PYTHON_VERSION}
23		28
24	post-install:	29	post-install:
25	${MKDIR} ${PREFIX}/share/bash-completion/completions	30	${MKDIR} ${PREFIX}/share/bash-completion/completions
26	${INSTALL_SCRIPT} ${WRKSRC}/data/completions/ges-launch-1.0 \	31	${INSTALL_SCRIPT} ${WRKSRC}/data/completions/ges-launch-1.0 \
27	${STAGEDIR}${PREFIX}/share/bash-completion/completions/	32	${STAGEDIR}${PREFIX}/share/bash-completion/completions/
28		33
29	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Lines 23-28 include/gstreamer-%%VERSION%%/ges/ges-gerror.h Link Here

(-)b/multimedia/gstreamer1-editing-services/pkg-plist (+4 lines)
23	include/gstreamer-%%VERSION%%/ges/ges-group.h	23	include/gstreamer-%%VERSION%%/ges/ges-group.h
24	include/gstreamer-%%VERSION%%/ges/ges-image-source.h	24	include/gstreamer-%%VERSION%%/ges/ges-image-source.h
25	include/gstreamer-%%VERSION%%/ges/ges-layer.h	25	include/gstreamer-%%VERSION%%/ges/ges-layer.h
		26	include/gstreamer-%%VERSION%%/ges/ges-marker-list.h
26	include/gstreamer-%%VERSION%%/ges/ges-meta-container.h	27	include/gstreamer-%%VERSION%%/ges/ges-meta-container.h
27	include/gstreamer-%%VERSION%%/ges/ges-multi-file-source.h	28	include/gstreamer-%%VERSION%%/ges/ges-multi-file-source.h
28	include/gstreamer-%%VERSION%%/ges/ges-operation-clip.h	29	include/gstreamer-%%VERSION%%/ges/ges-operation-clip.h
Lines 34-48 include/gstreamer-%%VERSION%%/ges/ges-prelude.h Link Here
34	include/gstreamer-%%VERSION%%/ges/ges-project.h	35	include/gstreamer-%%VERSION%%/ges/ges-project.h
35	include/gstreamer-%%VERSION%%/ges/ges-screenshot.h	36	include/gstreamer-%%VERSION%%/ges/ges-screenshot.h
36	include/gstreamer-%%VERSION%%/ges/ges-source-clip.h	37	include/gstreamer-%%VERSION%%/ges/ges-source-clip.h
		38	include/gstreamer-%%VERSION%%/ges/ges-source-clip-asset.h
37	include/gstreamer-%%VERSION%%/ges/ges-source.h	39	include/gstreamer-%%VERSION%%/ges/ges-source.h
38	include/gstreamer-%%VERSION%%/ges/ges-test-clip.h	40	include/gstreamer-%%VERSION%%/ges/ges-test-clip.h
39	include/gstreamer-%%VERSION%%/ges/ges-text-overlay-clip.h	41	include/gstreamer-%%VERSION%%/ges/ges-text-overlay-clip.h
40	include/gstreamer-%%VERSION%%/ges/ges-text-overlay.h	42	include/gstreamer-%%VERSION%%/ges/ges-text-overlay.h
		43	include/gstreamer-%%VERSION%%/ges/ges-time-overlay-clip.h
41	include/gstreamer-%%VERSION%%/ges/ges-timeline-element.h	44	include/gstreamer-%%VERSION%%/ges/ges-timeline-element.h
42	include/gstreamer-%%VERSION%%/ges/ges-timeline.h	45	include/gstreamer-%%VERSION%%/ges/ges-timeline.h
43	include/gstreamer-%%VERSION%%/ges/ges-title-clip.h	46	include/gstreamer-%%VERSION%%/ges/ges-title-clip.h
44	include/gstreamer-%%VERSION%%/ges/ges-title-source.h	47	include/gstreamer-%%VERSION%%/ges/ges-title-source.h
45	include/gstreamer-%%VERSION%%/ges/ges-track-element-asset.h	48	include/gstreamer-%%VERSION%%/ges/ges-track-element-asset.h
		49	include/gstreamer-%%VERSION%%/ges/ges-track-element-deprecated.h
46	include/gstreamer-%%VERSION%%/ges/ges-track-element.h	50	include/gstreamer-%%VERSION%%/ges/ges-track-element.h
47	include/gstreamer-%%VERSION%%/ges/ges-track.h	51	include/gstreamer-%%VERSION%%/ges/ges-track.h
48	include/gstreamer-%%VERSION%%/ges/ges-transition-clip.h	52	include/gstreamer-%%VERSION%%/ges/ges-transition-clip.h

Lines 1-36 Link Here

(-)b/multimedia/gstreamer1-libav/Makefile (-15 / +7 lines)
1	PORTNAME= gstreamer1-libav	1	PORTNAME= gstreamer1-libav
2	PORTVERSION= 1.16.2	2	PORTVERSION= 1.20.3
3	CATEGORIES= multimedia	3	CATEGORIES= multimedia
4	MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/	4	MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/
5	DISTNAME= gst-libav-${PORTVERSION}	5	DISTNAME= gst-libav-${PORTVERSION}
6		6
7	PATCH_SITES= https://gitlab.freedesktop.org/gstreamer/gst-libav/-/commit/
8	PATCHFILES+= 07b43c727c9a.patch:-p1 # https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/127
9
10	MAINTAINER= multimedia@FreeBSD.org	7	MAINTAINER= multimedia@FreeBSD.org
11	COMMENT= GStreamer plug-in with many audio/video decoders/encoders	8	COMMENT= GStreamer plug-in with many audio/video decoders/encoders
12		9
13	LICENSE= LGPL20+	10	LICENSE= LGPL20+
14	LICENSE_FILE= ${WRKSRC}/COPYING.LIB	11	LICENSE_FILE= ${WRKSRC}/COPYING
15		12
16	BUILD_DEPENDS= orc>=0.4.16:devel/orc	13	BUILD_DEPENDS= orc>=0.4.16:devel/orc
17	LIB_DEPENDS= liborc-0.4.so:devel/orc	14	LIB_DEPENDS= liborc-0.4.so:devel/orc
18		15
19	PORTSCOUT= limitw:1,even	16	PORTSCOUT= limitw:1,even
20		17
21	USES= compiler:features gettext-runtime gmake gnome gstreamer libtool localbase \	18	USES= bison gettext-runtime gnome gstreamer libtool localbase \
22	pkgconfig python:build tar:xz	19	meson ninja pkgconfig python:3.8+,build shebangfix tar:xz
23	USE_LDCONFIG= yes
24	USE_GNOME= glib20	20	USE_GNOME= glib20
25	GNU_CONFIGURE= yes
26	INSTALL_TARGET= install-strip
27		21
		22	SHEBANG_FILES= scripts/extract-release-date-from-doap-file.py
		23	python_OLD_CMD= "/usr/bin/env python3"
		24	python_CMD= ${SETENV} ${PYTHON_VERSION}
28	OPTIONS_DEFINE= FFMPEG	25	OPTIONS_DEFINE= FFMPEG
29	OPTIONS_DEFAULT=FFMPEG	26	OPTIONS_DEFAULT=FFMPEG
30		27
31	FFMPEG_DESC?= Use system ffmpeg instead of internal libav	28	FFMPEG_DESC?= Use system ffmpeg instead of internal libav
32	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg	29	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
33	FFMPEG_CONFIGURE_WITH= system-libav
34	FFMPEG_BUILD_DEPENDS_OFF= nasm:devel/nasm	30	FFMPEG_BUILD_DEPENDS_OFF= nasm:devel/nasm
35	FFMPEG_MAKE_ENV_OFF= V=1	31	FFMPEG_MAKE_ENV_OFF= V=1
36	FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH	32	FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH
Lines 41-48 FFMPEG_VARS_OFF+= NOPRECIOUSMAKEVARS=yes # ARCH Link Here
41	LDFLAGS_aarch64= -Wl,-z,notext	37	LDFLAGS_aarch64= -Wl,-z,notext
42	.endif	38	.endif
43		39
44	post-patch:
45	@${REINPLACE_CMD} -e 's\|-Werror\|\|g' \
46	${WRKSRC}/configure
47
48	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-23 Link Here

(-)b/multimedia/gstreamer1-libav/pkg-plist (-22 lines)
1	lib/gstreamer-1.0/libgstlibav.so	1	lib/gstreamer-1.0/libgstlibav.so
2	share/gtk-doc/html/gst-libav-plugins-1.0/ch01.html
3	share/gtk-doc/html/gst-libav-plugins-1.0/ch02.html
4	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-1.0.devhelp2
5	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudDec.html
6	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegAudEnc.html
7	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidDec.html
8	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-GstFFMpegVidEnc.html
9	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstav.html
10	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcfg.html
11	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavcodecmap.html
12	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavprotocol.html
13	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-gstavutils.html
14	share/gtk-doc/html/gst-libav-plugins-1.0/gst-libav-plugins-plugin-libav.html
15	share/gtk-doc/html/gst-libav-plugins-1.0/home.png
16	share/gtk-doc/html/gst-libav-plugins-1.0/index.html
17	share/gtk-doc/html/gst-libav-plugins-1.0/left-insensitive.png
18	share/gtk-doc/html/gst-libav-plugins-1.0/left.png
19	share/gtk-doc/html/gst-libav-plugins-1.0/right-insensitive.png
20	share/gtk-doc/html/gst-libav-plugins-1.0/right.png
21	share/gtk-doc/html/gst-libav-plugins-1.0/style.css
22	share/gtk-doc/html/gst-libav-plugins-1.0/up-insensitive.png
23	share/gtk-doc/html/gst-libav-plugins-1.0/up.png

Lines 1-4 Link Here

(-)b/multimedia/gstreamer1-plugins-bad/Makefile (-15 / +103 lines)
1	PORTREVISION= 3	1	PORTREVISION= 2
2	CATEGORIES= multimedia	2	CATEGORIES= multimedia
3		3
4	COMMENT= GStreamer-plugins that need more quality, testing or documentation	4	COMMENT= GStreamer-plugins that need more quality, testing or documentation
Lines 6-30 COMMENT= GStreamer-plugins that need more quality, testing or documentation Link Here
6	GST_PLUGIN= bad	6	GST_PLUGIN= bad
7	GST_PLUGIN_SUFFIX= -bad	7	GST_PLUGIN_SUFFIX= -bad
8		8
9	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	9	USES+= xorg
		10	USE_XORG+=x11
10		11
11	BUILD_DEPENDS+= v4l_compat>=1.0.20100321:multimedia/v4l_compat	12	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
12		13
13	DIST= bad	14	DIST= bad
14	BAD_GST_DIRS= gst-libs sys gst po pkgconfig	15	BAD_GST_ENABLED_PLUGINS= accurip \
15	# "extra" plugins enabled by default in Makefile.common	16	adaptivedemux \
16	BAD_GST_DIRS+= ext/bz2	17	adpcmdec \
		18	adpcmenc \
		19	aes \
		20	aiff \
		21	asfmux \
		22	audio \
		23	audiobuffersplit \
		24	audiofxbad \
		25	audiolatency \
		26	audiomixmatrix \
		27	audiovisualizers \
		28	autoconvert \
		29	basecamerabinsrc \
		30	bayer \
		31	bz2 \
		32	camerabin2 \
		33	codecalpha \
		34	codecparsers \
		35	codecs \
		36	coloreffects \
		37	data \
		38	debugutils \
		39	dvbsubenc \
		40	dvbsuboverlay \
		41	dvdspu \
		42	examples \
		43	faceoverlay \
		44	festival \
		45	fieldanalysis \
		46	freeverb \
		47	frei0r \
		48	gaudieffects \
		49	gdp \
		50	geometrictransform \
		51	id3tag \
		52	insertbin \
		53	inter \
		54	interfaces \
		55	interlace \
		56	ipcpipeline \
		57	isoff \
		58	ivfparse \
		59	ivtc \
		60	jp2kdecimator \
		61	jpegformat \
		62	librfb \
		63	midi \
		64	mpegdemux \
		65	mpegpsmux \
		66	mpegts \
		67	mpegtsdemux \
		68	mpegtsmux \
		69	mxf \
		70	netsim \
		71	nls \
		72	onvif \
		73	pcapparse \
		74	pkgconfig \
		75	play \
		76	player \
		77	pnm \
		78	proxy \
		79	rawparse \
		80	removesilence \
		81	rist \
82	rtmp2 \
83	rtp \
84	sctp \
85	sdp \
86	segmentclip \
87	shm \
88	siren \
89	smooth \
90	speed \
91	subenc \
92	switchbin \
93	timecode \
94	transcode \
95	transcoder \
96	uridownloader \
97	videofilters \
98	videoframe_audiolevel \
99	videoparsers \
100	videosignal \
101	vmnc \
102	webrtc \
103	y4m
104
17	NO_GSTREAMER_COMMON= yes	105	NO_GSTREAMER_COMMON= yes
18	PLIST= ${.CURDIR}/pkg-plist	106	PLIST= ${.CURDIR}/pkg-plist
19		107
20	do-build:	108	USES+=ssl
21	.for dir in ${BAD_GST_DIRS}
22	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET})
23	.endfor
24
25	do-install:
26	.for dir in ${BAD_GST_DIRS}
27	@(cd ${INSTALL_WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
28	.endfor
29		109
30	.include "${MASTERDIR}/Makefile"	110	.include "${MASTERDIR}/Makefile"
		111
		112	USE_GNOME+= glib20 gtk30
		113
		114	BUILD_DEPENDS+= v4l_compat>=1.0.20100321:multimedia/v4l_compat \
		115	gtk3>=3.10:x11-toolkits/gtk30
		116
		117	LIB_DEPENDS+=libnice.so:net-im/libnice
		118

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-data_meson.build (+12 lines)
1	--- data/meson.build.orig 2022-09-05 21:41:46 UTC
2	+++ data/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('data').enabled()
5	encoding_targetsdir = join_paths(get_option('datadir'),
6	'gstreamer-' + api_version, 'encoding-profiles')
7
8	@@ -21,3 +22,4 @@ foreach path_targets : encoding_targets
9	etargets = path_targets.get(1)
10	install_data(sources: etargets, install_dir: dir)
11	endforeach
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_dash_meson.build (+21 lines)
1	--- ext/dash/meson.build.orig 2022-09-13 21:07:32 UTC
2	+++ ext/dash/meson.build
3	@@ -45,9 +45,15 @@ if xml2_dep.found()
4	c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
5	link_args : noseh_link_args,
6	include_directories : [configinc, libsinc],
7	- dependencies : [gstadaptivedemux_dep, gsturidownloader_dep, gsttag_dep,
8	- gstnet_dep, gstpbutils_dep, gstbase_dep, gstisoff_dep,
9	- gio_dep, xml2_dep],
10	+ dependencies : [cc.find_library('gstadaptivedemux-1.0', required : true),
11	+ cc.find_library('gsturidownloader-1.0', required : true),
12	+ dependency('gstreamer-tag-1.0'),
13	+ dependency('gstreamer-net-1.0'),
14	+ dependency('gstreamer-pbutils-1.0'),
15	+ gstbase_dep,
16	+ cc.find_library('gstisoff-1.0', required : true),
17	+ gio_dep,
18	+ xml2_dep],
19	install : true,
20	install_dir : plugins_install_dir,
21	)

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_hls_meson.build (+12 lines)
1	--- ext/hls/meson.build.orig 2022-09-16 17:38:38 UTC
2	+++ ext/hls/meson.build
3	@@ -58,7 +58,8 @@ gsthls = library('gsthls',
4	link_args : noseh_link_args,
5	include_directories : [configinc],
6	dependencies : [gstpbutils_dep, gsttag_dep, gstvideo_dep,
7	- gstadaptivedemux_dep, gsturidownloader_dep,
8	+ cc.find_library('gstadaptivedemux-1.0', required: true),
9	+ cc.find_library('gsturidownloader-1.0', required: true),
10	hls_crypto_dep, gio_dep, libm],
11	install : true,
12	install_dir : plugins_install_dir,

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-ext_smoothstreaming_meson.build (+17 lines)
1	--- ext/smoothstreaming/meson.build.orig 2022-09-16 20:01:19 UTC
2	+++ ext/smoothstreaming/meson.build
3	@@ -13,8 +13,12 @@ if xml28_dep.found()
4	c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
5	link_args : noseh_link_args,
6	include_directories : [configinc, libsinc],
7	- dependencies : [gst_dep, gstadaptivedemux_dep, gstcodecparsers_dep,
8	- gsturidownloader_dep, gstisoff_dep, xml28_dep, gio_dep],
9	+ dependencies : [gst_dep,
10	+ cc.find_library('gstadaptivedemux-1.0', required : true),
11	+ dependency('gstreamer-codecparsers-1.0', required : true),
12	+ cc.find_library('gsturidownloader-1.0', required : true),
13	+ cc.find_library('gstisoff-1.0', required : true),
14	+ xml28_dep, gio_dep],
15	install : true,
16	install_dir : plugins_install_dir,
17	)

Removed Link Here

(-)a/multimedia/gstreamer1-plugins-bad/files/patch-git_a0cd455d (-142 lines)
1	From a0cd455dd0e0375c6395fe732173225ea7e18562 Mon Sep 17 00:00:00 2001
2	From: Debarshi Ray <rishi@gnu.org>
3	Date: Fri, 20 Mar 2020 15:49:06 +0100
4	Subject: [PATCH] lv2: Make it build with -fno-common
5
6	GCC 10 defaults to -fno-common. This means that global variables shared
7	across multiple translation units should be declared as 'extern' in
8	header files and defined in exactly one C file. See:
9	https://gcc.gnu.org/gcc-10/porting_to.html
10
11	https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125
12
13	Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1125>
14	---
15	ext/lv2/gstlv2.c \| 33 ++++++++++++++++++++++++++
16	ext/lv2/gstlv2.h \| 62 ++++++++++++++++++++++++------------------------
17	2 files changed, 64 insertions(+), 31 deletions(-)
18
19	diff --git a/ext/lv2/gstlv2.c b/ext/lv2/gstlv2.c
20	index 60d502f41a..7feeee1921 100644
21	--- ext/lv2/gstlv2.c
22	+++ ext/lv2/gstlv2.c
23	@@ -69,6 +69,39 @@ GST_DEBUG_CATEGORY (lv2_debug);
24	#error "Unsupported OS"
25	#endif
26
27	+LilvWorld *world = NULL;
28	+LilvNode *atom_class = NULL;
29	+LilvNode *audio_class = NULL;
30	+LilvNode *control_class = NULL;
31	+LilvNode *cv_class = NULL;
32	+LilvNode *event_class = NULL;
33	+LilvNode *input_class = NULL;
34	+LilvNode *output_class = NULL;
35	+LilvNode *preset_class = NULL;
36	+LilvNode *state_iface = NULL;
37	+LilvNode *state_uri = NULL;
38	+
39	+LilvNode *integer_prop = NULL;
40	+LilvNode *toggled_prop = NULL;
41	+LilvNode *designation_pred = NULL;
42	+LilvNode *in_place_broken_pred = NULL;
43	+LilvNode *optional_pred = NULL;
44	+LilvNode *group_pred = NULL;
45	+LilvNode *supports_event_pred = NULL;
46	+LilvNode *label_pred = NULL;
47	+
48	+LilvNode *center_role = NULL;
49	+LilvNode *left_role = NULL;
50	+LilvNode *right_role = NULL;
51	+LilvNode *rear_center_role = NULL;
52	+LilvNode *rear_left_role = NULL;
53	+LilvNode *rear_right_role = NULL;
54	+LilvNode *lfe_role = NULL;
55	+LilvNode *center_left_role = NULL;
56	+LilvNode *center_right_role = NULL;
57	+LilvNode *side_left_role = NULL;
58	+LilvNode *side_right_role = NULL;
59	+
60	GstStructure *lv2_meta_all = NULL;
61
62	static void
63	diff --git a/ext/lv2/gstlv2.h b/ext/lv2/gstlv2.h
64	index 177f9b2c19..9f72582294 100644
65	--- ext/lv2/gstlv2.h
66	+++ ext/lv2/gstlv2.h
67	@@ -28,40 +28,40 @@
68
69	#include "gstlv2utils.h"
70
71	-LilvWorld *world;
72	-LilvNode *atom_class;
73	-LilvNode *audio_class;
74	-LilvNode *control_class;
75	-LilvNode *cv_class;
76	-LilvNode *event_class;
77	-LilvNode *input_class;
78	-LilvNode *output_class;
79	-LilvNode *preset_class;
80	-LilvNode *state_iface;
81	-LilvNode *state_uri;
82	+extern LilvWorld *world;
83	+extern LilvNode *atom_class;
84	+extern LilvNode *audio_class;
85	+extern LilvNode *control_class;
86	+extern LilvNode *cv_class;
87	+extern LilvNode *event_class;
88	+extern LilvNode *input_class;
89	+extern LilvNode *output_class;
90	+extern LilvNode *preset_class;
91	+extern LilvNode *state_iface;
92	+extern LilvNode *state_uri;
93
94	-LilvNode *integer_prop;
95	-LilvNode *toggled_prop;
96	-LilvNode *designation_pred;
97	-LilvNode *in_place_broken_pred;
98	-LilvNode *optional_pred;
99	-LilvNode *group_pred;
100	-LilvNode *supports_event_pred;
101	-LilvNode *label_pred;
102	+extern LilvNode *integer_prop;
103	+extern LilvNode *toggled_prop;
104	+extern LilvNode *designation_pred;
105	+extern LilvNode *in_place_broken_pred;
106	+extern LilvNode *optional_pred;
107	+extern LilvNode *group_pred;
108	+extern LilvNode *supports_event_pred;
109	+extern LilvNode *label_pred;
110
111	-LilvNode *center_role;
112	-LilvNode *left_role;
113	-LilvNode *right_role;
114	-LilvNode *rear_center_role;
115	-LilvNode *rear_left_role;
116	-LilvNode *rear_right_role;
117	-LilvNode *lfe_role;
118	-LilvNode *center_left_role;
119	-LilvNode *center_right_role;
120	-LilvNode *side_left_role;
121	-LilvNode *side_right_role;
122	+extern LilvNode *center_role;
123	+extern LilvNode *left_role;
124	+extern LilvNode *right_role;
125	+extern LilvNode *rear_center_role;
126	+extern LilvNode *rear_left_role;
127	+extern LilvNode *rear_right_role;
128	+extern LilvNode *lfe_role;
129	+extern LilvNode *center_left_role;
130	+extern LilvNode *center_right_role;
131	+extern LilvNode *side_left_role;
132	+extern LilvNode *side_right_role;
133
134	-GstStructure *lv2_meta_all;
135	+extern GstStructure *lv2_meta_all;
136
137	void gst_lv2_filter_register_element (GstPlugin *plugin,
138	GstStructure * lv2_meta);
139	--
140	GitLab
141
142

Removed Link Here

(-)a/multimedia/gstreamer1-plugins-bad/files/patch-git_dc57fb70 (-26 lines)
1	https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1255
2
3	vkerror.c:66:16: error: use of undeclared identifier 'VK_RESULT_BEGIN_RANGE'
4	if (result < VK_RESULT_BEGIN_RANGE)
5	^
6
7	--- ext/vulkan/vkerror.c.orig 2019-04-19 09:16:36 UTC
8	+++ ext/vulkan/vkerror.c
9	@@ -27,7 +27,7 @@
10	#include "vkerror.h"
11
12	/* INDENT-OFF */
13	-static const struct
14	+static const struct
15	{
16	VkResult result;
17	const char *str;
18	@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result)
19
20	if (result >= 0)
21	return NULL;
22	- if (result < VK_RESULT_BEGIN_RANGE)
23	- return "Unknown Error";
24
25	for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) {
26	if (result == vk_result_string_map[i].result)

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_adaptivedemux_meson.build (+20 lines)
1	--- gst-libs/gst/adaptivedemux/meson.build.orig 2022-09-05 19:47:37 UTC
2	+++ gst-libs/gst/adaptivedemux/meson.build
3	@@ -1,5 +1,8 @@
4	+if get_option('adaptivedemux').enabled()
5	adaptivedemux_sources = files('gstadaptivedemux.c')
6	-adaptivedemux_headers = files('gstadaptivedemux.h')
7	+adaptivedemux_headers = files('gstadaptivedemux.h',
8	+ 'adaptive-demux-prelude.h')
9	+install_headers(adaptivedemux_headers, subdir : 'gstreamer-1.0/gst/adaptivedemux')
10
11	pkg_name = 'gstreamer-adaptivedemux-1.0'
12	gstadaptivedemux = library('gstadaptivedemux-' + api_version,
13	@@ -18,4 +21,5 @@ gstadaptivedemux_dep = declare_dependency(link_with :
14	include_directories : [libsinc],
15	dependencies : [gstbase_dep, gsturidownloader_dep])
16
17	-meson.override_dependency(pkg_name, gstadaptivedemux_dep)
18	\ No newline at end of file
19	+meson.override_dependency(pkg_name, gstadaptivedemux_dep)
20	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_audio_meson.build (+12 lines)
1	--- gst-libs/gst/audio/meson.build.orig 2022-09-05 20:33:42 UTC
2	+++ gst-libs/gst/audio/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('audio').enabled()
5	badaudio_sources = files('gstnonstreamaudiodecoder.c', 'gstplanaraudioadapter.c')
6	badaudio_headers = files('gstnonstreamaudiodecoder.h', 'audio-bad-prelude.h', 'gstplanaraudioadapter.h')
7	install_headers(badaudio_headers, subdir : 'gstreamer-1.0/gst/audio')
8	@@ -52,3 +53,4 @@ gstbadaudio_dep = declare_dependency(link_with : gstba
9	dependencies : [gstaudio_dep, gstbase_dep])
10
11	meson.override_dependency(pkg_name, gstbadaudio_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_basecamerabinsrc_meson.build (+12 lines)
1	--- gst-libs/gst/basecamerabinsrc/meson.build.orig 2022-09-05 21:00:40 UTC
2	+++ gst-libs/gst/basecamerabinsrc/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('basecamerabinsrc').enabled()
5	camerabin_sources = files(
6	'gstcamerabin-enum.c',
7	'gstcamerabinpreview.c',
8	@@ -51,3 +52,4 @@ gstbasecamerabin_dep = declare_dependency(link_with :
9	sources: gen_sources,
10	dependencies : [gstapp_dep])
11	meson.override_dependency(pkg_name, gstbasecamerabin_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecparsers_meson.build (+12 lines)
1	--- gst-libs/gst/codecparsers/meson.build.orig 2022-09-05 20:42:22 UTC
2	+++ gst-libs/gst/codecparsers/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('codecparsers').enabled()
5	codecparser_sources = files([
6	'gstjpeg2000sampling.c',
7	'gstjpegparser.c',
8	@@ -69,3 +70,4 @@ gstcodecparsers_dep = declare_dependency(link_with : g
9
10	libraries += [[pkg_name, {'lib': gstcodecparsers}]]
11	meson.override_dependency(pkg_name, gstcodecparsers_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_codecs_meson.build (+15 lines)
1	--- gst-libs/gst/codecs/meson.build.orig 2022-09-05 20:49:44 UTC
2	+++ gst-libs/gst/codecs/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('codecs').enabled()
5	codecs_sources = files(
6	'gsth264decoder.c',
7	'gsth264picture.c',
8	@@ -81,4 +82,5 @@ gstcodecs_dep = declare_dependency(link_with : gstcode
9	include_directories : [libsinc],
10	sources: gen_sources,
11	dependencies : [gstvideo_dep, gstcodecparsers_dep])
12	-meson.override_dependency(pkg_name, gstcodecs_dep)
13	\ No newline at end of file
14	+meson.override_dependency(pkg_name, gstcodecs_dep)
15	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_insertbin_meson.build (+12 lines)
1	--- gst-libs/gst/insertbin/meson.build.orig 2022-09-05 21:06:02 UTC
2	+++ gst-libs/gst/insertbin/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('insertbin').enabled()
5	insert_sources = files('gstinsertbin.c')
6	insert_headers = files('gstinsertbin.h')
7	install_headers(insert_headers, subdir : 'gstreamer-1.0/gst/insertbin')
8	@@ -51,3 +52,4 @@ gstinsertbin_dep = declare_dependency(link_with : gsti
9	dependencies : [gst_dep])
10
11	meson.override_dependency(pkg_name, gstinsertbin_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_interfaces_meson.build (+12 lines)
1	--- gst-libs/gst/interfaces/meson.build.orig 2022-09-05 21:08:24 UTC
2	+++ gst-libs/gst/interfaces/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('interfaces').enabled()
5	photography_sources = ['photography.c']
6	photo_headers = ['photography.h', 'photography-prelude.h']
7	install_headers(photo_headers, subdir : 'gstreamer-1.0/gst/interfaces')
8	@@ -40,3 +41,4 @@ gstphotography_dep = declare_dependency(link_with : gs
9
10	libraries += [[pkg_name, {'lib': gstphotography}]]
11	meson.override_dependency(pkg_name, gstphotography_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_isoff_meson.build (+21 lines)
1	--- gst-libs/gst/isoff/meson.build.orig 2022-09-15 15:00:43 UTC
2	+++ gst-libs/gst/isoff/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('isoff').enabled()
5	isoff_sources = [
6	'gstisoff.c',
7	]
8	@@ -6,6 +7,8 @@ isoff_headers = [
9	]
10	install_headers(isoff_headers, subdir : 'gstreamer-1.0/gst/isoff')
11
12	+pkg_name = 'gstreamer-isoff-1.0'
13	+
14	gstisoff = library('gstisoff-' + api_version,
15	isoff_sources,
16	c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API', '-DBUILDING_GST_ISOFF', '-DG_LOG_DOMAIN="GStreamer-ISOFF"'],
17	@@ -20,3 +23,4 @@ gstisoff = library('gstisoff-' + api_version,
18	gstisoff_dep = declare_dependency(link_with : gstisoff,
19	include_directories : [libsinc],
20	dependencies : [gstbase_dep])
21	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_mpegts_meson.build (+12 lines)
1	--- gst-libs/gst/mpegts/meson.build.orig 2022-09-05 21:11:41 UTC
2	+++ gst-libs/gst/mpegts/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('mpegts').enabled()
5	mpegts_sources = files(
6	'mpegts.c',
7	'gstmpegtssection.c',
8	@@ -82,3 +83,4 @@ gstmpegts_dep = declare_dependency(link_with : gstmpeg
9	dependencies : [gst_dep],
10	sources : gen_sources)
11	meson.override_dependency(pkg_name, gstmpegts_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_play_meson.build (+12 lines)
1	--- gst-libs/gst/play/meson.build.orig 2022-09-05 21:13:21 UTC
2	+++ gst-libs/gst/play/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('play').enabled()
5	gstplay_sources = files(
6	'gstplay.c',
7	'gstplay-signal-adapter.c',
8	@@ -74,3 +75,4 @@ gstplay_dep = declare_dependency(link_with : gstplay,
9	gsttag_dep, gstpbutils_dep])
10
11	meson.override_dependency(pkg_name, gstplay_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_player_meson.build (+12 lines)
1	--- gst-libs/gst/player/meson.build.orig 2022-09-05 21:14:52 UTC
2	+++ gst-libs/gst/player/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('player').enabled()
5	gstplayer_sources = files([
6	'gstplayer.c',
7	'gstplayer-signal-dispatcher.c',
8	@@ -77,3 +78,4 @@ gstplayer_dep = declare_dependency(link_with : gstplay
9	gsttag_dep, gstpbutils_dep])
10
11	meson.override_dependency(pkg_name, gstplayer_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_sctp_meson.build (+12 lines)
1	--- gst-libs/gst/sctp/meson.build.orig 2022-09-05 21:16:11 UTC
2	+++ gst-libs/gst/sctp/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('sctp').enabled()
5	sctp_sources = [
6	'sctpreceivemeta.c',
7	'sctpsendmeta.c',
8	@@ -36,3 +37,4 @@ gstsctp_dep = declare_dependency(link_with : libgstsct
9	dependencies : [gstbase_dep])
10
11	meson.override_dependency(pkg_name, gstsctp_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_transcoder_meson.build (+12 lines)
1	--- gst-libs/gst/transcoder/meson.build.orig 2022-09-05 21:18:30 UTC
2	+++ gst-libs/gst/transcoder/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('transcoder').enabled()
5	sources = files(['gsttranscoder.c', 'gsttranscoder-signal-adapter.c'])
6	headers = files(['gsttranscoder.h', 'transcoder-prelude.h', 'gsttranscoder-signal-adapter.h'])
7
8	@@ -64,3 +65,4 @@ gst_transcoder_dep = declare_dependency(link_with: gst
9	include_directories : [libsinc]
10	)
11	meson.override_dependency(pkg_name, gst_transcoder_dep)
12	+endif

Added Link Here

(-)b/multimedia/gstreamer1-plugins-bad/files/patch-gst-libs_gst_uridownloader_meson.build (+15 lines)
1	--- gst-libs/gst/uridownloader/meson.build.orig 2022-09-05 21:20:17 UTC
2	+++ gst-libs/gst/uridownloader/meson.build
3	@@ -1,3 +1,4 @@
4	+if get_option('uridownloader').enabled()
5	urid_sources = [
6	'gstfragment.c',
7	'gsturidownloader.c',
8	@@ -27,4 +28,5 @@ gsturidownloader_dep = declare_dependency(link_with :
9	dependencies : [gstbase_dep])
10
11	libraries += [[pkg_name, {'lib': gsturidownloader}]]
12	-meson.override_dependency(pkg_name, gsturidownloader_dep)
13	\ No newline at end of file
14	+meson.override_dependency(pkg_name, gsturidownloader_dep)
15	+endif