diff options
Diffstat (limited to 'multimedia/gstreamer1-plugins')
19 files changed, 171 insertions, 110 deletions
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile index 4b2621cc3247..8c938409e92b 100644 --- a/multimedia/gstreamer1-plugins/Makefile +++ b/multimedia/gstreamer1-plugins/Makefile @@ -1,7 +1,7 @@ PORTNAME= gstreamer PORTVERSION?= ${BASE_PORTVERSION} # plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}. -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= multimedia audio MASTER_SITES= https://gstreamer.freedesktop.org/src/gst-plugins-base/:base \ https://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \ @@ -21,8 +21,23 @@ LIB_DEPENDS+= libfreetype.so:print/freetype2 \ liborc-0.4.so:devel/orc RUN_DEPENDS+= iso-codes>=0:misc/iso-codes +USES+= meson cpe gettext gnome gstreamer libtool pathfix pkgconfig python:build tar:xz +CPE_VENDOR= gstreamer_project +CPE_PRODUCT= gstreamer +USE_GNOME+= glib20 introspection:build libxml2 +USE_LDCONFIG= yes + +MESON_ARGS+= --auto-features=auto # XXX bug 270361 workaround + +CFLAGS+= -Wno-format +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${EXTRA_LIBS} + PORTSCOUT= limitw:1,even +PLIST_SUB+= SOVERSION="${_GST_SOVERSION}" \ + VERSION="${_GST_LIB_VER}" + BASE_PORTVERSION= ${_GST_VERSION} BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION} BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX} @@ -35,38 +50,15 @@ GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX} UGLY_PORTVERSION= ${_GST_VERSION} 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:build tar:xz -USE_GNOME+= glib20 introspection:build libxml2 -GST_PLUGIN?= base -USE_LDCONFIG= yes -MESON_ARGS+= --auto-features=auto # XXX bug 270361 workaround - -CPE_VENDOR= gstreamer_project -CPE_PRODUCT= gstreamer - -CFLAGS+= -Wno-format -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${EXTRA_LIBS} - DEFAULT_AUDIOSINK?= osssink DEFAULT_AUDIOSRC?= osssrc - -.if ${DIST}=="" -IGNORE= DIST not specified -.endif - -VERSION= 1.0 -SOVERSION= 0.2210.0 -PLIST_SUB+= VERSION="${VERSION}" \ - SOVERSION="${SOVERSION}" +DIST?= base +GST_PLUGIN?= base # Include bsd.port.options.mk and not bsd.port.pre.mk to be able to use USES .include <bsd.port.options.mk> .if ${GST_PLUGIN} == "base" -DIST= base NO_GSTREAMER_COMMON= yes BASE_GST_ENABLED_PLUGINS= adder \ @@ -79,6 +71,8 @@ BASE_GST_ENABLED_PLUGINS= adder \ audioresample \ audiotestsrc \ compositor \ + debugutils \ + dsd \ encoding \ fft \ gio \ @@ -105,45 +99,48 @@ BASE_GST_ENABLED_PLUGINS= adder \ volume .endif -.if ${DIST} == base || ${DIST} == ugly -CONFIGURE_ARGS+= -Ddefaultaudiosink="${DEFAULT_AUDIOSINK}" \ +.if ${DIST} == "base" || ${DIST} == "ugly" +MESON_ARGS+= -Ddefaultaudiosink="${DEFAULT_AUDIOSINK}" \ -Ddefaultaudiosrc="${DEFAULT_AUDIOSRC}" .endif .include "${MASTERDIR}/Makefile.common" -.if ${DIST}=="base" -EXTRACT_ONLY=${BASE_DISTFILE} -WRKSRC=${WRKDIR}/${BASE_DISTNAME} +.if ${DIST} == "base" +EXTRACT_ONLY= ${BASE_DISTFILE} +WRKSRC= ${WRKDIR}/${BASE_DISTNAME} PORTVERSION= ${BASE_PORTVERSION} DISTFILES+= ${BASE_DISTFILE}:base -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins/files -.elif ${DIST}=="bad" -EXTRACT_ONLY=${BAD_DISTFILE} -WRKSRC=${WRKDIR}/${BAD_DISTNAME} +PATCHDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins/files +.elif ${DIST} == "bad" +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" -EXTRACT_ONLY=${UGLY_DISTFILE} -WRKSRC=${WRKDIR}/${UGLY_DISTNAME} +PATCHDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins-bad/files +.elif ${DIST} == "ugly" +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" -EXTRACT_ONLY=${GOOD_DISTFILE} -WRKSRC=${WRKDIR}/${GOOD_DISTNAME} +PATCHDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins-ugly/files +.elif ${DIST} == "good" +EXTRACT_ONLY= ${GOOD_DISTFILE} +WRKSRC= ${WRKDIR}/${GOOD_DISTNAME} PORTVERSION= ${GOOD_PORTVERSION} DISTFILES+= ${GOOD_DISTFILE}:good -PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins-good/files -.elif ${DIST}=="makesum" +PATCHDIR= ${.CURDIR:H:H}/multimedia/gstreamer1-plugins-good/files +.elif ${DIST} == "makesum" DISTFILES+= ${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \ ${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good .else -BROKEN= Unknown dist setting +BROKEN= unknown DIST setting .endif pre-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-${VERSION} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-${_GST1_LIB_VER} + +makesum-gst1: + ${MAKE} DIST=makesum makesum .include <bsd.port.mk> diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common index 7d713f0dd7c3..b4e25db540c0 100644 --- a/multimedia/gstreamer1-plugins/Makefile.common +++ b/multimedia/gstreamer1-plugins/Makefile.common @@ -11,6 +11,8 @@ BASE_GST_ALL_PLUGINS+= \ audiotestsrc \ cdparanoia \ compositor \ + debugutils \ + dsd \ doc \ encoding \ examples \ @@ -53,21 +55,29 @@ BASE_GST_ENABLED_PLUGINS?= BAD_GST_ALL_PLUGINS+= \ accurip \ + adaptivedemux \ adpcmdec \ adpcmenc \ aes \ aiff \ - androidmedia \ + aja \ + amfcodec \ + analytics \ + analyticsoverlay \ + androidmedia\ aom \ applemedia \ asfmux \ + asio \ assrender \ + audio \ audiobuffersplit \ audiofxbad \ audiolatency \ audiomixmatrix \ audiovisualizers \ autoconvert \ + avtp \ basecamerabinsrc \ bayer \ bluez \ @@ -76,6 +86,7 @@ BAD_GST_ALL_PLUGINS+= \ camerabin2 \ chromaprint \ closedcaption \ + codec2json \ codecalpha \ codecparsers \ codecs \ @@ -83,33 +94,51 @@ BAD_GST_ALL_PLUGINS+= \ coloreffects \ colormanagement \ curl \ + curl-ssh2 \ + d3d11 \ + d3d11-hlsl-precompile \ + d3d11-math \ + d3d11-wgc \ + d3d12 \ dash \ data \ dc1394 \ debugutils \ + decklink \ directfb \ + directshow \ directsound \ doc \ + drm \ dtls \ dts \ dvb \ dvbsubenc \ dvbsuboverlay \ dvdspu \ + dwrite \ + dxva \ examples \ + extra-checks \ faac \ faad \ faceoverlay \ + fbdev \ + fdkaac \ festival \ fieldanalysis \ flite \ + fluidsynth \ freeverb \ frei0r \ gaudieffects \ gdp \ geometrictransform \ + gl \ gme \ + gs \ gsm \ + gtk3 \ hls \ id3tag \ insertbin \ @@ -117,6 +146,8 @@ BAD_GST_ALL_PLUGINS+= \ interfaces \ interlace \ ipcpipeline \ + iqa \ + isac \ isoff \ ivfparse \ ivtc \ @@ -124,9 +155,15 @@ BAD_GST_ALL_PLUGINS+= \ jpegformat \ kms \ ladspa \ + ladspa-rdf \ + lc3 \ + ldac \ libde265 \ librfb \ lv2 \ + magicleap \ + mediafoundation \ + microdns \ midi \ modplug \ mpeg2enc \ @@ -137,30 +174,41 @@ BAD_GST_ALL_PLUGINS+= \ mpegtsmux \ mplex \ msdk \ + mse \ + musepack \ mxf \ neon \ netsim \ nls \ nvcodec \ + onnx \ onvif \ openal \ + openaptx \ opencv \ openexr \ openh264 \ openjpeg \ openmpt \ + openni2 \ + opensles \ opus \ + orc \ pcapparse \ pkgconfig \ play \ player \ pnm \ proxy \ + qroverlay \ + qsv \ + qt6d3d11 \ rawparse \ removesilence \ resindvd \ rist \ rsvg \ + rtmp \ rtmp2 \ rtp \ sbc \ @@ -178,8 +226,10 @@ BAD_GST_ALL_PLUGINS+= \ srt \ srtp \ subenc \ + svtav1 \ svthevcenc \ switchbin \ + teletext \ tests \ timecode \ tinyalsa \ @@ -187,21 +237,30 @@ BAD_GST_ALL_PLUGINS+= \ transcode \ transcoder \ ttml \ + udev \ + unixfd \ uridownloader \ uvch264 \ + uvcgadget \ v4l2codecs \ + va \ videofilters \ videoframe_audiolevel \ videoparsers \ videosignal \ vmnc \ + voaacenc \ + voamrwbenc \ vulkan \ wasapi \ + wasapi2 \ wayland \ webp \ webrtc \ webrtcdsp \ + wic \ wildmidi \ + win32ipc \ winks \ winscreencap \ x265 \ @@ -215,6 +274,8 @@ GOOD_GST_ALL_PLUGINS+= \ aalib \ adaptivedemux2 \ alpha \ + amrnb \ + amrwbdec \ apetag \ audiofx \ audioparsers \ @@ -263,6 +324,7 @@ GOOD_GST_ALL_PLUGINS+= \ png \ pulse \ qt5 \ + qt6 \ replaygain \ rtp \ rtpmanager \ @@ -295,8 +357,6 @@ GOOD_GST_ENABLED_PLUGINS?= UGLY_GST_ALL_PLUGINS+= \ a52dec \ - amrnb \ - amrwbdec \ asfdemux \ cdio \ dvdlpcmdec \ diff --git a/multimedia/gstreamer1-plugins/distinfo b/multimedia/gstreamer1-plugins/distinfo index 54593ded3c4a..866d46797b37 100644 --- a/multimedia/gstreamer1-plugins/distinfo +++ b/multimedia/gstreamer1-plugins/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1709494555 -SHA256 (gst-plugins-base-1.22.10.tar.xz) = 843a3a2da28e1ee6aeea56dd2be9bffcc3b4bbcd0f974eba4abfc3aa31f0399c -SIZE (gst-plugins-base-1.22.10.tar.xz) = 2371240 -SHA256 (gst-plugins-bad-1.22.10.tar.xz) = dabcd60c762165bb043eba753d599212514c94684e4db9a2e25484cb6508ebbf -SIZE (gst-plugins-bad-1.22.10.tar.xz) = 5549660 -SHA256 (gst-plugins-ugly-1.22.10.tar.xz) = cc80a81a22c0b3b31ab7f1b8bf18dda23c72d2791b86cc6264923a68336329ea -SIZE (gst-plugins-ugly-1.22.10.tar.xz) = 255832 -SHA256 (gst-plugins-good-1.22.10.tar.xz) = f748feae922cad62f20102a84ade8f42b78e1e44a34866aa3ea766f9172e1c7f -SIZE (gst-plugins-good-1.22.10.tar.xz) = 2840828 +TIMESTAMP = 1726789410 +SHA256 (gst-plugins-base-1.24.8.tar.xz) = 10fb31743750ccd498d3933e8aaecda563ebc65596a6ab875b47ee936e4b9599 +SIZE (gst-plugins-base-1.24.8.tar.xz) = 2439740 +SHA256 (gst-plugins-bad-1.24.8.tar.xz) = 35ad70de3d7cbca3089f33bb77c45750daad2ae93d79827fdbb469fa8aba84eb +SIZE (gst-plugins-bad-1.24.8.tar.xz) = 7069792 +SHA256 (gst-plugins-ugly-1.24.8.tar.xz) = 3dfc12bf0b766682b7d6e1e29a404b55e2375ba172d11900179738ae89b7a2d5 +SIZE (gst-plugins-ugly-1.24.8.tar.xz) = 227100 +SHA256 (gst-plugins-good-1.24.8.tar.xz) = 613a20f03bd4544b52f10f6ceb4e0fffd25eff15bf338ab8b12b971982eb0153 +SIZE (gst-plugins-good-1.24.8.tar.xz) = 2924936 diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_gstcdparanoiasrc.c b/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_gstcdparanoiasrc.c index 6d0fa67b9a28..2e9cf97604d8 100644 --- a/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_gstcdparanoiasrc.c +++ b/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_gstcdparanoiasrc.c @@ -1,6 +1,6 @@ ---- ext/cdparanoia/gstcdparanoiasrc.c.orig 2009-08-09 17:16:48.000000000 -0400 -+++ ext/cdparanoia/gstcdparanoiasrc.c 2009-08-09 17:17:38.000000000 -0400 -@@ -264,6 +264,7 @@ gst_cd_paranoia_src_open (GstCddaBaseSrc +--- ext/cdparanoia/gstcdparanoiasrc.c.orig 2024-08-21 11:25:15 UTC ++++ ext/cdparanoia/gstcdparanoiasrc.c +@@ -259,6 +259,7 @@ gst_cd_paranoia_src_open (GstAudioCdSrc * audiocdsrc, GST_INFO_OBJECT (src, "search overlap set to %u", src->search_overlap); } @@ -8,7 +8,7 @@ cache_size = src->cache_size; if (cache_size == -1) { /* if paranoia mode is low (the default), assume we're doing playback */ -@@ -274,6 +275,7 @@ gst_cd_paranoia_src_open (GstCddaBaseSrc +@@ -269,6 +270,7 @@ gst_cd_paranoia_src_open (GstAudioCdSrc * audiocdsrc, } paranoia_cachemodel_size (src->p, cache_size); GST_INFO_OBJECT (src, "set cachemodel size to %u", cache_size); diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_meson.build b/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_meson.build index e350413856b0..590f2b959401 100644 --- a/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-ext_cdparanoia_meson.build @@ -1,6 +1,6 @@ ---- ext/cdparanoia/meson.build.orig 2023-01-23 19:29:34 UTC +--- ext/cdparanoia/meson.build.orig 2024-08-21 11:25:15 UTC +++ ext/cdparanoia/meson.build -@@ -42,7 +42,7 @@ if cdparanoia_found +@@ -43,7 +43,7 @@ if cdparanoia_found ['gstcdparanoiasrc.c'], include_directories: [configinc, libsinc], c_args : gst_plugins_base_args + extra_args, diff --git a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build index 92e0bdc7bd5b..a579d1d275f3 100644 --- a/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-ext_gl_meson.build @@ -1,6 +1,6 @@ ---- ext/gl/meson.build.orig 2022-06-15 22:36:22 UTC +--- ext/gl/meson.build.orig 2024-08-21 11:25:15 UTC +++ ext/gl/meson.build -@@ -116,10 +116,6 @@ if bcm_host_dep.found() +@@ -114,10 +114,6 @@ endif optional_deps += bcm_host_dep endif @@ -11,7 +11,7 @@ if ['darwin', 'ios'].contains(host_system) if not have_objc error('No ObjC compiler found') -@@ -146,7 +142,7 @@ gstopengl = library('gstopengl', +@@ -144,7 +140,7 @@ gstopengl = library('gstopengl', objc_args : gst_plugins_base_args + gl_objc_args + extra_c_args, link_args : noseh_link_args, include_directories : [configinc], diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_allocators_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_allocators_meson.build index 83363c686d6e..fc9b2843bf37 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_allocators_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_allocators_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/allocators/meson.build.orig 2022-09-06 20:56:00 UTC +--- gst-libs/gst/allocators/meson.build.orig 2024-08-21 11:25:15 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 +@@ -85,3 +86,4 @@ meson.override_dependency('gstreamer-allocators-1.0', sources : allocators_gen_sources) meson.override_dependency('gstreamer-allocators-1.0', allocators_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_app_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_app_meson.build index 16265f7ae6a4..a554c9fffb14 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_app_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_app_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/app/meson.build.orig 2022-09-06 20:56:57 UTC +--- gst-libs/gst/app/meson.build.orig 2024-08-21 11:25:15 UTC +++ gst-libs/gst/app/meson.build @@ -1,3 +1,4 @@ +if get_option('app').enabled() - app_sources = files(['gstappsrc.c', 'gstappsink.c']) + app_sources = files(['gstappsrc.c', 'gstappsink.c', 'gstapputils.c']) app_mkenum_headers = files([ -@@ -68,3 +69,4 @@ app_dep = declare_dependency(link_with: gstapp, +@@ -69,3 +70,4 @@ meson.override_dependency(pkg_name, app_dep) sources : app_gen_sources) meson.override_dependency(pkg_name, app_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_audio_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_audio_meson.build index 8f0ce22916af..c289de4320a4 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_audio_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_audio_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/audio/meson.build.orig 2022-09-06 20:57:46 UTC +--- gst-libs/gst/audio/meson.build.orig 2024-08-21 11:25:15 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, +@@ -194,3 +195,4 @@ meson.override_dependency(pkg_name, audio_dep) sources : audio_gen_sources) meson.override_dependency(pkg_name, audio_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build index 4b0563f6ae23..a703339e63bf 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_gl_meson.build @@ -1,6 +1,6 @@ ---- gst-libs/gst/gl/meson.build.orig 2023-01-23 19:29:34 UTC +--- gst-libs/gst/gl/meson.build.orig 2024-08-21 11:25:15 UTC +++ gst-libs/gst/gl/meson.build -@@ -555,11 +555,6 @@ if need_platform_egl != 'no' +@@ -566,11 +566,6 @@ if need_platform_egl != 'no' gl_platform_deps += egl_dep glconf.set('GST_GL_HAVE_PLATFORM_EGL', 1) @@ -12,7 +12,7 @@ egl_includes = ''' #include <EGL/egl.h> #include <EGL/eglext.h> -@@ -1060,7 +1055,7 @@ if build_gstgl +@@ -1103,7 +1098,7 @@ if build_gstgl soversion : soversion, darwin_versions : osxversion, install : true, @@ -21,16 +21,16 @@ 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) -@@ -1074,7 +1069,7 @@ if build_gstgl +@@ -1120,7 +1115,7 @@ if build_gstgl library_def = {'lib': gstgl} 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, + variables : pkgconfig_variables + pkgconfig_gl_variables + pkgconfig_installed_variables, uninstalled_variables : pkgconfig_gl_variables, subdirs : pkgconfig_subdirs, -@@ -1106,7 +1101,7 @@ if build_gstgl +@@ -1152,7 +1147,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'], @@ -39,7 +39,7 @@ } library_def += {'gir': [gir]} if not static_build -@@ -1118,7 +1113,7 @@ if build_gstgl +@@ -1166,7 +1161,7 @@ if build_gstgl gstgl_dep = declare_dependency(link_with : gstgl, include_directories : [libsinc, compat_includes], sources: gen_sources, @@ -48,7 +48,7 @@ variables: pkgconfig_gl_variables) gstglproto_dep = declare_dependency( dependencies : [gstgl_dep] + gl_lib_deps, -@@ -1149,7 +1144,7 @@ if build_gstgl +@@ -1197,7 +1192,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'], @@ -57,7 +57,7 @@ } gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} gst_libraries += [[pkg_name, {'gir': gir_dict}]] -@@ -1185,7 +1180,7 @@ if build_gstgl +@@ -1234,7 +1229,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'], @@ -66,7 +66,7 @@ } gir_dict = gir + {'includes': gir['includes'] + ['GstGL-1.0']} -@@ -1221,7 +1216,7 @@ if build_gstgl +@@ -1271,7 +1266,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'], diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_pbutils_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_pbutils_meson.build index b44119ba0013..65a1065215dd 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_pbutils_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_pbutils_meson.build @@ -1,15 +1,12 @@ ---- gst-libs/gst/pbutils/meson.build.orig 2022-09-06 20:58:54 UTC +--- gst-libs/gst/pbutils/meson.build.orig 2024-08-21 11:25:15 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, +@@ -100,3 +101,4 @@ meson.override_dependency(pkg_name, pbutils_dep) sources : pbutils_gen_sources) --meson.override_dependency(pkg_name, pbutils_dep) -\ No newline at end of file -+meson.override_dependency(pkg_name, pbutils_dep) + meson.override_dependency(pkg_name, pbutils_dep) +endif diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtp_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtp_meson.build index 4c7ffee35a97..cdde174c17cb 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtp_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtp_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/rtp/meson.build.orig 2022-09-06 21:07:44 UTC +--- gst-libs/gst/rtp/meson.build.orig 2024-08-21 11:25:15 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, +@@ -86,3 +87,4 @@ meson.override_dependency(pkg_name, rtp_dep) sources : rtp_gen_sources) meson.override_dependency(pkg_name, rtp_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtsp_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtsp_meson.build index 87113a89c97d..8a68ccc13310 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtsp_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_rtsp_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/rtsp/meson.build.orig 2022-09-06 21:08:11 UTC +--- gst-libs/gst/rtsp/meson.build.orig 2024-08-21 11:25:15 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, +@@ -91,3 +92,4 @@ meson.override_dependency(pkg_name, rtsp_dep) sources : rtsp_gen_sources) meson.override_dependency(pkg_name, rtsp_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_meson.build index 8b452b9c5ce4..7a7d013b61e9 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_sdp_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/sdp/meson.build.orig 2022-09-06 21:08:38 UTC +--- gst-libs/gst/sdp/meson.build.orig 2024-08-21 11:25:15 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, +@@ -61,3 +62,4 @@ meson.override_dependency(pkg_name, sdp_dep) sources: sdp_gen_sources) meson.override_dependency(pkg_name, sdp_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_tag_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_tag_meson.build index 25ca4ed6c521..9f9b122a6839 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_tag_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_tag_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/tag/meson.build.orig 2022-09-06 21:09:11 UTC +--- gst-libs/gst/tag/meson.build.orig 2024-08-21 11:25:15 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', +@@ -143,3 +144,4 @@ gst_tag_dir = meson.current_source_dir() install : false) gst_tag_dir = meson.current_source_dir() diff --git a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_meson.build b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_meson.build index 5828602535fe..1c75a7c3bdc6 100644 --- a/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-gst-libs_gst_video_meson.build @@ -1,11 +1,11 @@ ---- gst-libs/gst/video/meson.build.orig 2023-01-23 19:29:34 UTC +--- gst-libs/gst/video/meson.build.orig 2024-08-21 11:25:15 UTC +++ gst-libs/gst/video/meson.build @@ -1,3 +1,4 @@ +if get_option('video').enabled() video_sources = files([ 'colorbalance.c', 'colorbalancechannel.c', -@@ -183,3 +184,4 @@ meson.override_dependency(pkg_name, video_dep) +@@ -186,3 +187,4 @@ meson.override_dependency(pkg_name, video_dep) sources : video_gen_sources) meson.override_dependency(pkg_name, video_dep) diff --git a/multimedia/gstreamer1-plugins/files/patch-meson.build b/multimedia/gstreamer1-plugins/files/patch-meson.build index 3c494fcde987..a7c122bbb186 100644 --- a/multimedia/gstreamer1-plugins/files/patch-meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-meson.build @@ -1,4 +1,4 @@ ---- meson.build.orig 2023-01-23 19:29:34 UTC +--- meson.build.orig 2024-08-21 11:25:15 UTC +++ meson.build @@ -17,6 +17,8 @@ gst_version_is_dev = gst_version_minor % 2 == 1 and gs gst_version_is_stable = gst_version_minor.is_even() @@ -9,7 +9,7 @@ host_system = host_machine.system() have_cxx = add_languages('cpp', native: false, required: false) -@@ -295,8 +297,10 @@ core_conf.set_quoted('DEFAULT_VIDEOSINK', 'autovideosi +@@ -293,8 +295,10 @@ core_conf.set_quoted('DEFAULT_VIDEOSINK', 'autovideosi # FIXME: These should be configure options core_conf.set_quoted('DEFAULT_VIDEOSINK', 'autovideosink') @@ -21,7 +21,7 @@ # Set whether the audioresampling method should be detected at runtime core_conf.set('AUDIORESAMPLE_FORMAT_' + get_option('audioresample_format').to_upper(), true) -@@ -489,6 +493,7 @@ pkgconfig_plugins_base_libs_variables = [ +@@ -505,6 +509,7 @@ pkgconfig_plugins_base_libs_variables = [ 'libraries=' + ' '.join(base_libraries), ] @@ -29,7 +29,7 @@ pkgconfig.generate( libraries : [gst_dep], variables : pkgconfig_variables + pkgconfig_plugins_base_libs_variables, -@@ -502,6 +507,7 @@ run_command(meson_pkg_config_file_fixup_script, +@@ -518,6 +523,7 @@ run_command(meson_pkg_config_file_fixup_script, run_command(meson_pkg_config_file_fixup_script, 'gstreamer-plugins-base-1.0', 'libraries', check: true) diff --git a/multimedia/gstreamer1-plugins/files/patch-tools_meson.build b/multimedia/gstreamer1-plugins/files/patch-tools_meson.build index 6d1c193da58c..150234dd99db 100644 --- a/multimedia/gstreamer1-plugins/files/patch-tools_meson.build +++ b/multimedia/gstreamer1-plugins/files/patch-tools_meson.build @@ -1,4 +1,4 @@ ---- tools/meson.build.orig 2023-01-23 19:29:34 UTC +--- tools/meson.build.orig 2024-08-21 11:25:15 UTC +++ tools/meson.build @@ -1,3 +1,4 @@ +if not get_option('tools').disabled() @@ -9,7 +9,7 @@ }, } --if not get_option('tools').disabled() +-if not get_option('tools').disabled() and not static_build foreach tool, data: gst_tools exe_name = '@0@-@1@'.format(tool, api_version) executable(exe_name, diff --git a/multimedia/gstreamer1-plugins/pkg-plist b/multimedia/gstreamer1-plugins/pkg-plist index a4928b0517c2..c929da4bed5a 100644 --- a/multimedia/gstreamer1-plugins/pkg-plist +++ b/multimedia/gstreamer1-plugins/pkg-plist @@ -4,8 +4,10 @@ bin/gst-play-%%VERSION%% include/gstreamer-%%VERSION%%/gst/allocators/allocators-prelude.h include/gstreamer-%%VERSION%%/gst/allocators/allocators.h include/gstreamer-%%VERSION%%/gst/allocators/gstdmabuf.h +include/gstreamer-%%VERSION%%/gst/allocators/gstdrmdumb.h include/gstreamer-%%VERSION%%/gst/allocators/gstfdmemory.h include/gstreamer-%%VERSION%%/gst/allocators/gstphysmemory.h +include/gstreamer-%%VERSION%%/gst/allocators/gstshmallocator.h include/gstreamer-%%VERSION%%/gst/app/app-enumtypes.h include/gstreamer-%%VERSION%%/gst/app/app-prelude.h include/gstreamer-%%VERSION%%/gst/app/app.h @@ -36,6 +38,8 @@ include/gstreamer-%%VERSION%%/gst/audio/gstaudioringbuffer.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiosink.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiosrc.h include/gstreamer-%%VERSION%%/gst/audio/gstaudiostreamalign.h +include/gstreamer-%%VERSION%%/gst/audio/gstdsd.h +include/gstreamer-%%VERSION%%/gst/audio/gstdsdformat.h include/gstreamer-%%VERSION%%/gst/audio/streamvolume.h include/gstreamer-%%VERSION%%/gst/fft/fft-prelude.h include/gstreamer-%%VERSION%%/gst/fft/fft.h @@ -120,6 +124,7 @@ 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-dma.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 @@ -148,7 +153,9 @@ lib/gstreamer-%%VERSION%%/libgstaudiomixer.so lib/gstreamer-%%VERSION%%/libgstaudiorate.so lib/gstreamer-%%VERSION%%/libgstaudioresample.so lib/gstreamer-%%VERSION%%/libgstaudiotestsrc.so +lib/gstreamer-%%VERSION%%/libgstbasedebug.so lib/gstreamer-%%VERSION%%/libgstcompositor.so +lib/gstreamer-%%VERSION%%/libgstdsd.so lib/gstreamer-%%VERSION%%/libgstencoding.so lib/gstreamer-%%VERSION%%/libgstgio.so lib/gstreamer-%%VERSION%%/libgstoverlaycomposition.so @@ -207,9 +214,6 @@ libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc -share/man/man1/gst-device-monitor-%%VERSION%%.1.gz -share/man/man1/gst-discoverer-%%VERSION%%.1.gz -share/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 @@ -260,3 +264,6 @@ share/locale/tr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo +share/man/man1/gst-device-monitor-%%VERSION%%.1.gz +share/man/man1/gst-discoverer-%%VERSION%%.1.gz +share/man/man1/gst-play-%%VERSION%%.1.gz |