git: 726cb7704774 - main - multimedia/mediamtx: Update to 1.12.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Wed, 16 Apr 2025 21:17:57 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=726cb7704774a79be79ab0b70e97041f69a6a7ba

commit 726cb7704774a79be79ab0b70e97041f69a6a7ba
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-04-16 19:46:46 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-04-16 21:16:43 +0000

    multimedia/mediamtx: Update to 1.12.0
    
    Changelog: https://github.com/bluenviron/mediamtx/releases/tag/v1.12.0
---
 multimedia/mediamtx/Makefile                 |  5 +-
 multimedia/mediamtx/distinfo                 | 14 ++---
 multimedia/mediamtx/files/patch-mediamtx.yml | 78 +++++++++++++++-------------
 multimedia/mediamtx/files/patch-rpicamera    | 29 ++++-------
 4 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/multimedia/mediamtx/Makefile b/multimedia/mediamtx/Makefile
index 85fc38f74fd5..17372698db8b 100644
--- a/multimedia/mediamtx/Makefile
+++ b/multimedia/mediamtx/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	mediamtx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.3
-PORTREVISION=	3
+DISTVERSION=	1.12.0
 CATEGORIES=	multimedia net
-MASTER_SITES+=	https://github.com/video-dev/hls.js/releases/download/v1.5.20/
+MASTER_SITES+=	https://github.com/video-dev/hls.js/releases/download/v1.6.2/
 DISTFILES+=	release.zip
 
 MAINTAINER=	diizzy@FreeBSD.org
diff --git a/multimedia/mediamtx/distinfo b/multimedia/mediamtx/distinfo
index da334a89a8ab..c42843bf315f 100644
--- a/multimedia/mediamtx/distinfo
+++ b/multimedia/mediamtx/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1738973871
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.11.3/release.zip) = b67b84ce6aedbed53f7907b516aceee1ae40e6082103915bc7024a62fa562841
-SIZE (go/multimedia_mediamtx/mediamtx-v1.11.3/release.zip) = 4585318
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.11.3/v1.11.3.mod) = 22c235c175b09d6e55e35e1dfe2899380241bb84fb176098245409857c11ae49
-SIZE (go/multimedia_mediamtx/mediamtx-v1.11.3/v1.11.3.mod) = 4535
-SHA256 (go/multimedia_mediamtx/mediamtx-v1.11.3/v1.11.3.zip) = 8b7aa5514feee607a7ee06de55a5154dc870392dce2c844921f10f19a28666a0
-SIZE (go/multimedia_mediamtx/mediamtx-v1.11.3/v1.11.3.zip) = 601562
+TIMESTAMP = 1744742593
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.12.0/release.zip) = d9c80634bcf683fb3b56c9bc2587a5d1dd883901d7278602abb87458c8d5eaf7
+SIZE (go/multimedia_mediamtx/mediamtx-v1.12.0/release.zip) = 5402144
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.12.0/v1.12.0.mod) = e3abffb48da4f3b2b4ff60bf19c00cee2ad78f95f2ab52bf01c012e1a9ec741c
+SIZE (go/multimedia_mediamtx/mediamtx-v1.12.0/v1.12.0.mod) = 4238
+SHA256 (go/multimedia_mediamtx/mediamtx-v1.12.0/v1.12.0.zip) = 6cab73c0bf4a68896cda980b21d04f03ebce351e3fe1e8d86b4020aef646e596
+SIZE (go/multimedia_mediamtx/mediamtx-v1.12.0/v1.12.0.zip) = 614087
diff --git a/multimedia/mediamtx/files/patch-mediamtx.yml b/multimedia/mediamtx/files/patch-mediamtx.yml
index 510b64f9765a..323871f2aded 100644
--- a/multimedia/mediamtx/files/patch-mediamtx.yml
+++ b/multimedia/mediamtx/files/patch-mediamtx.yml
@@ -1,79 +1,83 @@
---- mediamtx.yml.orig	2025-02-02 14:33:21 UTC
+--- mediamtx.yml.orig	2025-04-15 18:39:24 UTC
 +++ mediamtx.yml
-@@ -419,7 +419,6 @@ pathDefaults:
+@@ -423,8 +423,7 @@ pathDefaults:
    # * whep://existing-url -> the stream is pulled from another WebRTC server / camera
    # * wheps://existing-url -> the stream is pulled from another WebRTC server / camera with HTTPS
    # * redirect -> the stream is provided by another path or server
 -  # * rpiCamera -> the stream is provided by a Raspberry Pi Camera
-   # The following variables can be used in the source string:
+-  # The following variables can be used in the source string:
++   # The following variables can be used in the source string:
    # * $MTX_QUERY: query parameters (passed by first reader)
    # * $G1, $G2, ...: regular expression groups, if path name is
-@@ -504,95 +503,6 @@ pathDefaults:
- 
-   # RTSP URL which clients will be redirected to.
+   #   a regular expression.
+@@ -513,99 +512,6 @@ pathDefaults:
+   # path which clients will be redirected to.
+   # It can be can be a relative path (i.e. /otherstream) or an absolute RTSP URL.
    sourceRedirect:
 -
 -  ###############################################
 -  # Default path settings -> Raspberry Pi Camera source (when source is "rpiCamera")
 -
--  # ID of the camera
+-  # ID of the camera.
 -  rpiCameraCamID: 0
--  # Width of frames
+-  # Whether this is a secondary stream.
+-  rpiCameraSecondary: false
+-  # Width of frames.
 -  rpiCameraWidth: 1920
--  # Height of frames
+-  # Height of frames.
 -  rpiCameraHeight: 1080
--  # Flip horizontally
+-  # Flip horizontally.
 -  rpiCameraHFlip: false
--  # Flip vertically
+-  # Flip vertically.
 -  rpiCameraVFlip: false
--  # Brightness [-1, 1]
+-  # Brightness [-1, 1].
 -  rpiCameraBrightness: 0
--  # Contrast [0, 16]
+-  # Contrast [0, 16].
 -  rpiCameraContrast: 1
--  # Saturation [0, 16]
+-  # Saturation [0, 16].
 -  rpiCameraSaturation: 1
--  # Sharpness [0, 16]
+-  # Sharpness [0, 16].
 -  rpiCameraSharpness: 1
 -  # Exposure mode.
--  # values: normal, short, long, custom
+-  # values: normal, short, long, custom.
 -  rpiCameraExposure: normal
 -  # Auto-white-balance mode.
--  # values: auto, incandescent, tungsten, fluorescent, indoor, daylight, cloudy, custom
+-  # values: auto, incandescent, tungsten, fluorescent, indoor, daylight, cloudy, custom.
 -  rpiCameraAWB: auto
 -  # Auto-white-balance fixed gains. This can be used in place of rpiCameraAWB.
--  # format: [red,blue]
+-  # format: [red,blue].
 -  rpiCameraAWBGains: [0, 0]
 -  # Denoise operating mode.
--  # values: off, cdn_off, cdn_fast, cdn_hq
+-  # values: off, cdn_off, cdn_fast, cdn_hq.
 -  rpiCameraDenoise: "off"
 -  # Fixed shutter speed, in microseconds.
 -  rpiCameraShutter: 0
 -  # Metering mode of the AEC/AGC algorithm.
--  # values: centre, spot, matrix, custom
+-  # values: centre, spot, matrix, custom.
 -  rpiCameraMetering: centre
--  # Fixed gain
+-  # Fixed gain.
 -  rpiCameraGain: 0
--  # EV compensation of the image [-10, 10]
+-  # EV compensation of the image [-10, 10].
 -  rpiCameraEV: 0
--  # Region of interest, in format x,y,width,height (all normalized between 0 and 1)
+-  # Region of interest, in format x,y,width,height (all normalized between 0 and 1).
 -  rpiCameraROI:
 -  # Whether to enable HDR on Raspberry Camera 3.
 -  rpiCameraHDR: false
--  # Tuning file
+-  # Tuning file.
 -  rpiCameraTuningFile:
 -  # Sensor mode, in format [width]:[height]:[bit-depth]:[packing]
 -  # bit-depth and packing are optional.
 -  rpiCameraMode:
--  # frames per second
+-  # frames per second.
 -  rpiCameraFPS: 30
--  # Autofocus mode
--  # values: auto, manual, continuous
+-  # Autofocus mode.
+-  # values: auto, manual, continuous.
 -  rpiCameraAfMode: continuous
--  # Autofocus range
--  # values: normal, macro, full
+-  # Autofocus range.
+-  # values: normal, macro, full.
 -  rpiCameraAfRange: normal
--  # Autofocus speed
--  # values: normal, fast
+-  # Autofocus speed.
+-  # values: normal, fast.
 -  rpiCameraAfSpeed: normal
 -  # Lens position (for manual autofocus only), will be set to focus to a specific distance
 -  # calculated by the following formula: d = 1 / value
@@ -91,16 +95,18 @@
 -  # Text that is printed on each frame.
 -  # format is the one of the strftime() function.
 -  rpiCameraTextOverlay: '%Y-%m-%d %H:%M:%S - MediaMTX'
--  # Codec. Available values: auto, hardwareH264, softwareH264
+-  # Codec. Available values: auto, hardwareH264, softwareH264, mjpeg.
 -  rpiCameraCodec: auto
--  # Period between IDR frames
+-  # Period between H264 IDR frames.
 -  rpiCameraIDRPeriod: 60
--  # Bitrate
+-  # H264 Bitrate.
 -  rpiCameraBitrate: 5000000
--  # H264 profile
+-  # H264 profile.
 -  rpiCameraProfile: main
--  # H264 level
+-  # H264 level.
 -  rpiCameraLevel: '4.1'
+-  # JPEG quality.
+-  rpiCameraJPEGQuality: 60
  
    ###############################################
    # Default path settings -> Hooks
diff --git a/multimedia/mediamtx/files/patch-rpicamera b/multimedia/mediamtx/files/patch-rpicamera
index 81e708c591aa..57a37027af30 100644
--- a/multimedia/mediamtx/files/patch-rpicamera
+++ b/multimedia/mediamtx/files/patch-rpicamera
@@ -6,12 +6,11 @@ Subject: [PATCH] rpicamera: disable
 ---
  internal/staticsources/rpicamera/camera.go           | 2 +-
  internal/staticsources/rpicamera/camera_disabled.go  | 2 --
- internal/staticsources/rpicamera/component.go        | 2 +-
- internal/staticsources/rpicamera/component_32.go     | 2 +-
- internal/staticsources/rpicamera/component_64.go     | 2 +-
+ internal/staticsources/rpicamera/camera_32.go        | 2 +-
+ internal/staticsources/rpicamera/camera_64.go        | 2 +-
  internal/staticsources/rpicamera/params_serialize.go | 2 +-
  internal/staticsources/rpicamera/pipe.go             | 2 +-
- 7 files changed, 6 insertions(+), 8 deletions(-)
+ 6 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/internal/staticsources/rpicamera/camera.go b/internal/staticsources/rpicamera/camera.go
 index 9db131f4..b8a41317 100644
@@ -33,30 +32,20 @@ index ac84ee59..e54ccaa3 100644
  package rpicamera
  
  import (
-diff --git a/internal/staticsources/rpicamera/component.go b/internal/staticsources/rpicamera/component.go
-index c4036390..e138f929 100644
---- internal/staticsources/rpicamera/component.go
-+++ internal/staticsources/rpicamera/component.go
-@@ -1,4 +1,4 @@
--//go:build (linux && arm) || (linux && arm64)
-+//go:build exclude
- 
- package rpicamera
- 
-diff --git a/internal/staticsources/rpicamera/component_32.go b/internal/staticsources/rpicamera/component_32.go
+diff --git a/internal/staticsources/rpicamera/component_32.go b/internal/staticsources/rpicamera/camera_32.go
 index b7d19f11..51615164 100644
---- internal/staticsources/rpicamera/component_32.go
-+++ internal/staticsources/rpicamera/component_32.go
+--- internal/staticsources/rpicamera/camera_32.go
++++ internal/staticsources/rpicamera/camera_32.go
 @@ -1,4 +1,4 @@
 -//go:build linux && arm
 +//go:build exclude
  
  package rpicamera
  
-diff --git a/internal/staticsources/rpicamera/component_64.go b/internal/staticsources/rpicamera/component_64.go
+diff --git a/internal/staticsources/rpicamera/component_64.go b/internal/staticsources/rpicamera/camera_64.go
 index 690bf567..ed2e89dd 100644
---- internal/staticsources/rpicamera/component_64.go
-+++ internal/staticsources/rpicamera/component_64.go
+--- internal/staticsources/rpicamera/camera_64.go
++++ internal/staticsources/rpicamera/camera_64.go
 @@ -1,4 +1,4 @@
 -//go:build linux && arm64
 +//go:build exclude