diff options
Diffstat (limited to 'audio')
-rw-r--r-- | audio/Makefile | 1 | ||||
-rw-r--r-- | audio/go-librespot/Makefile | 29 | ||||
-rw-r--r-- | audio/go-librespot/distinfo | 5 | ||||
-rw-r--r-- | audio/go-librespot/files/config.yml | 1 | ||||
-rw-r--r-- | audio/go-librespot/files/go-librespot.in | 41 | ||||
-rw-r--r-- | audio/go-librespot/pkg-descr | 3 | ||||
-rw-r--r-- | audio/go-librespot/pkg-plist | 2 | ||||
-rw-r--r-- | audio/hydrogen/Makefile | 57 | ||||
-rw-r--r-- | audio/hydrogen/distinfo | 6 | ||||
-rw-r--r-- | audio/hydrogen/files/patch-CMakeLists.txt | 78 | ||||
-rw-r--r-- | audio/hydrogen/pkg-plist | 7 | ||||
-rw-r--r-- | audio/mythplugin-mythmusic/Makefile | 14 | ||||
-rw-r--r-- | audio/mythplugin-mythmusic/distinfo | 6 | ||||
-rw-r--r-- | audio/plasma6-kpipewire/files/patch-git-01-6dc69b0674f9946641e88151c209ce58f085d06a | 116 |
14 files changed, 285 insertions, 81 deletions
diff --git a/audio/Makefile b/audio/Makefile index 0d41946a908a..c6ab5f910ea6 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -216,6 +216,7 @@ SUBDIR += gnupod SUBDIR += gnuspeechsa SUBDIR += gnustep-cdplayer + SUBDIR += go-librespot SUBDIR += goattracker SUBDIR += gogglesmm SUBDIR += gonic diff --git a/audio/go-librespot/Makefile b/audio/go-librespot/Makefile new file mode 100644 index 000000000000..6e251cd497ce --- /dev/null +++ b/audio/go-librespot/Makefile @@ -0,0 +1,29 @@ +PORTNAME= go-librespot +DISTVERSIONPREFIX= v +DISTVERSION= 0.5.0 +CATEGORIES= audio + +MAINTAINER= ale@biancalanas.net +COMMENT= Yet another open-source Spotify Connect client, written in Go +WWW= https://github.com/devgianlu/go-librespot + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libogg.so:audio/libogg \ + libasound.so:audio/alsa-lib \ + libvorbis.so:audio/libvorbis + +USES= go:modules pkgconfig +USE_RC_SUBR= ${PORTNAME} + +GO_MODULE= github.com/devgianlu/go-librespot + +GO_TARGET= ./cmd/daemon:${PREFIX}/bin/go-librespot +GO_BUILDFLAGS= -ldflags "-X github.com/devgianlu/go-librespot.version=${DISTVERSION} -X github.com/devgianlu/go-librespot.commit=fc55ed0" + +post-install: + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${FILESDIR}/config.yml ${STAGEDIR}${ETCDIR}/config.yml.sample + +.include <bsd.port.mk> diff --git a/audio/go-librespot/distinfo b/audio/go-librespot/distinfo new file mode 100644 index 000000000000..6880489138e4 --- /dev/null +++ b/audio/go-librespot/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1759670837 +SHA256 (go/audio_go-librespot/go-librespot-v0.5.0/v0.5.0.mod) = dfb7c599404395927cf1755213c311f48ea63344b30f1f516be4c57bb4ea8654 +SIZE (go/audio_go-librespot/go-librespot-v0.5.0/v0.5.0.mod) = 1828 +SHA256 (go/audio_go-librespot/go-librespot-v0.5.0/v0.5.0.zip) = db94a0c511f586d5e1662417c82c1debf1bc01934440d22e2dc37ab18a78d2eb +SIZE (go/audio_go-librespot/go-librespot-v0.5.0/v0.5.0.zip) = 424569 diff --git a/audio/go-librespot/files/config.yml b/audio/go-librespot/files/config.yml new file mode 100644 index 000000000000..60a087651df9 --- /dev/null +++ b/audio/go-librespot/files/config.yml @@ -0,0 +1 @@ +log_disable_timestamp: true diff --git a/audio/go-librespot/files/go-librespot.in b/audio/go-librespot/files/go-librespot.in new file mode 100644 index 000000000000..526cd959822b --- /dev/null +++ b/audio/go-librespot/files/go-librespot.in @@ -0,0 +1,41 @@ +#!/bin/sh + +# PROVIDE: go_librespot +# REQUIRE: DAEMON NETWORKING +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf.local, /etc/rc.conf or +# /etc/rc.conf.d/go-librespot to enable this service: +# +# go_librespot_enable (bool): Set to NO by default. +# Set it to "YES" to enable go-librespot. +# go_librespot_config_dir (str): Set to %%PREFIX%%/etc/go-librespot by default. +# Path to configuration file. +# go_librespot_user (str): Set to "nobody" by default. +# User to run go-librespot + +. /etc/rc.subr + +name=go_librespot +rcvar=go_librespot_enable +start_precmd="${name}_precmd" + +load_rc_config $name + +: ${go_librespot_enable:="NO"} +: ${go_librespot_config_dir:="%%PREFIX%%/etc/go-librespot"} +: ${go_librespot_user:="nobody"} + +pidfile="/var/run/${name}/${name}.pid" +procname="%%PREFIX%%/bin/go-librespot" +command="/usr/sbin/daemon" +command_args="-S -m 3 -s info -l daemon -p ${pidfile} ${procname} --config_dir ${go_librespot_config_dir}" + +go_librespot_precmd() +{ + /usr/bin/install -d -m 0755 -o ${go_librespot_user} ${go_librespot_config_dir} + /usr/bin/install -d -m 0755 -o ${go_librespot_user} /var/run/${name} +} + +run_rc_command "$1" diff --git a/audio/go-librespot/pkg-descr b/audio/go-librespot/pkg-descr new file mode 100644 index 000000000000..bd23e6fc4956 --- /dev/null +++ b/audio/go-librespot/pkg-descr @@ -0,0 +1,3 @@ +Yet another open-source Spotify Connect compatible client, written in Go. +go-librespot gives you the freedom to have a Spotify Connect device wherever +you want. diff --git a/audio/go-librespot/pkg-plist b/audio/go-librespot/pkg-plist new file mode 100644 index 000000000000..278fe33f67e9 --- /dev/null +++ b/audio/go-librespot/pkg-plist @@ -0,0 +1,2 @@ +bin/go-librespot +@sample %%ETCDIR%%/config.yml.sample diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile index f9548e73d221..a19e5712e983 100644 --- a/audio/hydrogen/Makefile +++ b/audio/hydrogen/Makefile @@ -1,9 +1,7 @@ PORTNAME= hydrogen -DISTVERSION= 1.2.1 -PORTREVISION= 2 +DISTVERSION= 1.2.6 CATEGORIES= audio -MASTER_SITES= https://github.com/hydrogen-music/${PORTNAME}/releases/download/${DISTVERSION}/ \ - SF/hydrogen/Hydrogen/${DISTVERSION}%20Sources/ +MASTER_SITES= SF/hydrogen/Hydrogen/${DISTVERSION}%20Sources/ MAINTAINER= FreeBSD@ShaneWare.Biz COMMENT= Advanced drum machine @@ -15,31 +13,32 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libsndfile.so:audio/libsndfile \ liblo.so:audio/liblo -USES= cmake compiler:c++17-lang desktop-file-utils pkgconfig \ - localbase qt:5 +USES= cmake compiler:c++17-lang desktop-file-utils gl libarchive \ + pkgconfig localbase:ldflags qt:6 +USE_GL= gl USE_LDCONFIG= yes -USE_QT= core gui network widgets xml xmlpatterns buildtools:build \ - linguisttools:build qmake:build svg testlib:build +USE_QT= base svg tools -PLIST_SUB= HYDROGEN_VERSION="${PORTVERSION}" +LDFLAGS+= -lexecinfo +PLIST_SUB= HYDROGEN_VERSION="${DISTVERSION}" -OPTIONS_DEFINE= ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \ - PULSEAUDIO RDF TEST -OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF -OPTIONS_SINGLE= EXPORT -OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR +CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${LOCALBASE}/share/man +CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen \ + WANT_LIBARCHIVE \ + WANT_QT6 -EXPORT_DESC= Export support for drumkit -LIBARCHIVE_DESC= LibArchive support -LIBTAR_DESC= Libtar support +OPTIONS_DEFINE= ALSA JACK LADSPA LASH OSS PORTAUDIO \ + PORTMIDI PULSEAUDIO RDF RUBBERBAND TEST +OPTIONS_DEFAULT= JACK LADSPA OSS RDF + +PORTMIDI_DESC= PortMidi support RDF_DESC= RDF File support +RUBBERBAND_DESC= librubberband for time stretching ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins ALSA_CMAKE_BOOL= WANT_ALSA -DEBUG_CMAKE_BOOL= WANT_DEBUG - JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION @@ -51,30 +50,30 @@ LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa LASH_LIB_DEPENDS= liblash.so:audio/lash LASH_CMAKE_BOOL= WANT_LASH -LIBARCHIVE_USES= libarchive -LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE - -LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar -LIBTAR_CMAKE_BOOL= WANT_LIBTAR -LIBTAR_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/ - OSS_CMAKE_BOOL= WANT_OSS PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO +PORTMIDI_LIB_DEPENDS= libportmidi.so:audio/portmidi +PORTMIDI_CMAKE_BOOL= WANT_PORTMIDI + PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf RDF_CMAKE_BOOL= WANT_LRDF -RDF_CMAKE_ON= -DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2 + +# using librubberband is experimental and current versions have bad timing +# installing the rubberband cli tool still works as before +RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband +RUBBERBAND_CMAKE_BOOL= WANT_RUBBERBAND +#RUBBERBAND_CMAKE_ON= -DRUBBERBAND_INCLUDE_DIR:STRING=${LOCALBASE}/include/rubberband TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit TEST_CMAKE_BOOL= WANT_CPPUNIT -TEST_LDFLAGS= -lexecinfo do-test-TEST-on: - cd ${WRKSRC} && ./src/tests/tests + cd ${WRKSRC} && ${WRKDIR}/.build/src/tests/tests .include <bsd.port.mk> diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo index 399aae334ea7..a011e96916f8 100644 --- a/audio/hydrogen/distinfo +++ b/audio/hydrogen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691792032 -SHA256 (hydrogen-1.2.1.tar.gz) = bc338a36b7119ca8caa266eeb05d8298ef7d137b7864560e32fa3fadd3d528ae -SIZE (hydrogen-1.2.1.tar.gz) = 12920203 +TIMESTAMP = 1757839706 +SHA256 (hydrogen-1.2.6.tar.gz) = efba32610498acde76fa2e147017c91b20c13ec945e05e348cd4183fd1613be1 +SIZE (hydrogen-1.2.6.tar.gz) = 14412178 diff --git a/audio/hydrogen/files/patch-CMakeLists.txt b/audio/hydrogen/files/patch-CMakeLists.txt index 42b168534178..638d79557be9 100644 --- a/audio/hydrogen/files/patch-CMakeLists.txt +++ b/audio/hydrogen/files/patch-CMakeLists.txt @@ -1,36 +1,46 @@ ---- CMakeLists.txt.orig 2023-03-31 14:32:25 UTC +--- CMakeLists.txt.orig 2025-07-29 17:36:04 UTC +++ CMakeLists.txt -@@ -206,9 +206,9 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) - CHECK_INCLUDE_FILES(libtar.h HAVE_LIBTAR_H) - CHECK_INCLUDE_FILES(execinfo.h HAVE_EXECINFO_H) - FIND_PACKAGE(Backtrace) --CHECK_LIBRARY_EXISTS(tar tar_open "" HAVE_LIBTAR_OPEN) --CHECK_LIBRARY_EXISTS(tar tar_close "" HAVE_LIBTAR_CLOSE) --CHECK_LIBRARY_EXISTS(tar tar_extract_all "" HAVE_LIBTAR_EXTRACT_ALL) -+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_open "" HAVE_LIBTAR_OPEN) -+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_close "" HAVE_LIBTAR_CLOSE) -+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_extract_all "" HAVE_LIBTAR_EXTRACT_ALL) - IF(HAVE_LIBTAR_H AND HAVE_LIBTAR_OPEN AND HAVE_LIBTAR_CLOSE AND HAVE_LIBTAR_EXTRACT_ALL) - SET(LIBTAR_OK TRUE) - ELSE() -@@ -222,6 +222,11 @@ ENDIF() - FIND_HELPER(LIBARCHIVE libarchive archive.h archive) - IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND) - SET(WANT_LIBTAR FALSE) -+ SET(LIBTAR_LIBRARIES "") -+ SET(LIBTAR_INCLUDE_DIRS "") -+ELSE() -+ SET(LIBARCHIVE_LIBRARIES "") -+ SET(LIBARCHIVE_INCLUDE_DIRS "") - ENDIF() - FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile) - FIND_HELPER(ALSA alsa alsa/asoundlib.h asound ) -@@ -231,6 +236,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo) +@@ -77,7 +77,11 @@ set(WANT_LIBTAR TRUE) + # CONFIG OPTIONS + # + set(WANT_LIBTAR TRUE) ++if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + option(WANT_DEBUG "Build with debug information" ON) ++else() ++option(WANT_DEBUG "Build with debug information" OFF) ++endif() + if(APPLE) + option(WANT_SHARED "Build the core library shared." OFF) + option(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" OFF) +@@ -130,10 +134,8 @@ if(WANT_DEBUG) + include(StatusSupportOptions) - IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") - FIND_HELPER(OSS oss sys/soundcard.h ossaudio ) -+ELSEIF("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") -+ FIND_HELPER(OSS oss sys/soundcard.h c ) - ELSE() - FIND_HELPER(OSS oss sys/soundcard.h OSSlib ) - ENDIF() + if(WANT_DEBUG) +- set(CMAKE_BUILD_TYPE Debug) + set(H2CORE_HAVE_DEBUG TRUE) + else() +- set(CMAKE_BUILD_TYPE Release) + set(H2CORE_HAVE_DEBUG FALSE) + endif() + +@@ -172,9 +174,9 @@ if(WANT_DEBUG) + endif() + + if(WANT_DEBUG) +- set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + else() +- set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + + if(WANT_APPIMAGE) +@@ -304,6 +306,8 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") + + if("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD") + find_helper(OSS oss sys/soundcard.h ossaudio ) ++elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") ++ find_helper(OSS oss sys/soundcard.h c ) + else() + find_helper(OSS oss sys/soundcard.h OSSlib ) + endif() diff --git a/audio/hydrogen/pkg-plist b/audio/hydrogen/pkg-plist index 546583b010cf..ce2fad9f4c80 100644 --- a/audio/hydrogen/pkg-plist +++ b/audio/hydrogen/pkg-plist @@ -28,6 +28,7 @@ include/hydrogen/core/Globals.h include/hydrogen/core/H2Exception.h include/hydrogen/core/Helpers/Files.h include/hydrogen/core/Helpers/Filesystem.h +include/hydrogen/core/Helpers/Future.h include/hydrogen/core/Helpers/Legacy.h include/hydrogen/core/Helpers/Random.h include/hydrogen/core/Helpers/Translations.h @@ -64,8 +65,8 @@ include/hydrogen/core/Preferences/Preferences.h include/hydrogen/core/Preferences/Theme.h include/hydrogen/core/Sampler/Interpolation.h include/hydrogen/core/Sampler/Sampler.h -include/hydrogen/core/Smf/SMF.h -include/hydrogen/core/Smf/SMFEvent.h +include/hydrogen/core/SMF/SMF.h +include/hydrogen/core/SMF/SMFEvent.h include/hydrogen/core/SoundLibrary/SoundLibraryDatabase.h include/hydrogen/core/SoundLibrary/SoundLibraryInfo.h include/hydrogen/core/Synth/Synth.h @@ -75,7 +76,7 @@ include/hydrogen/core/Version.h include/hydrogen/core/rt_clock.h lib/libhydrogen-core-%%HYDROGEN_VERSION%%.so share/man/man1/hydrogen.1.gz -share/appdata/org.hydrogenmusic.Hydrogen.appdata.xml +share/metainfo/org.hydrogenmusic.Hydrogen.metainfo.xml share/applications/org.hydrogenmusic.Hydrogen.desktop %%DATADIR%%/data/click.wav %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index 2d32db058fff..ce7b5e3c8f11 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -1,7 +1,6 @@ PORTNAME= mythmusic DISTVERSIONPREFIX= v -DISTVERSION= 34.0 -PORTREVISION= 2 +DISTVERSION= 35.0 CATEGORIES= audio PKGNAMEPREFIX= mythplugin- @@ -10,18 +9,18 @@ COMMENT= Music playing plugin for MythTV WWW= https://www.mythtv.org/wiki/MythMusic LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/../LICENSE LIB_DEPENDS= libFLAC.so:audio/flac \ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ - libmyth-34.so:multimedia/mythtv + libmyth-35.so:multimedia/mythtv USES= gmake qt:5 shebangfix USE_GITHUB= yes GH_ACCOUNT= MythTV GH_PROJECT= mythtv -USE_LDCONFIG= yes USE_QT= buildtools:build core gui qmake:build sql widgets xml SHEBANG_FILES= ../mythtv/programs/scripts/metadata/Music/mbutils.py @@ -34,19 +33,16 @@ CONFIGURE_ENV= QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \ MAKE_ENV= QTDIR="${PREFIX}" \ QMAKESPEC="${QMAKESPEC}" DESTDIRNAME= INSTALL_ROOT -PLIST_SUB= MYTHSHARE="share/mythtv" WRKSRC_SUBDIR= mythplugins +PLIST_SUB= MYTHSHARE="share/mythtv" OPTIONS_DEFINE= CDIO +OPTIONS_DEFAULT=CDIO CDIO_LIB_DEPENDS= libcdio.so:sysutils/libcdio \ libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= cdio -FFTW_DESC= FFTW3-based visualizations -FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 -FFTW_CONFIGURE_ENABLE= fftw - post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/configure \ diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo index 817a516dabd2..8766614738da 100644 --- a/audio/mythplugin-mythmusic/distinfo +++ b/audio/mythplugin-mythmusic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708697729 -SHA256 (MythTV-mythtv-v34.0_GH0.tar.gz) = 1c0a0f9ae190468d07ebfb534c720ef8c62811148a9f928c56876e9fdbd5d6bf -SIZE (MythTV-mythtv-v34.0_GH0.tar.gz) = 118820346 +TIMESTAMP = 1741514105 +SHA256 (MythTV-mythtv-v35.0_GH0.tar.gz) = 1d06520d1f0726a8d131aa323e9cd04f34a8154b32efe827dd570c2b212196c8 +SIZE (MythTV-mythtv-v35.0_GH0.tar.gz) = 120302443 diff --git a/audio/plasma6-kpipewire/files/patch-git-01-6dc69b0674f9946641e88151c209ce58f085d06a b/audio/plasma6-kpipewire/files/patch-git-01-6dc69b0674f9946641e88151c209ce58f085d06a new file mode 100644 index 000000000000..b5aa8d8c3c0f --- /dev/null +++ b/audio/plasma6-kpipewire/files/patch-git-01-6dc69b0674f9946641e88151c209ce58f085d06a @@ -0,0 +1,116 @@ +From 6dc69b0674f9946641e88151c209ce58f085d06a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch> +Date: Wed, 27 Aug 2025 16:39:36 +0200 +Subject: [PATCH] Fix build with ffmpeg >= 8.0 + +--- + src/h264vaapiencoder.cpp | 12 +++++++++--- + src/libopenh264encoder.cpp | 12 +++++++++--- + src/libx264encoder.cpp | 12 +++++++++--- + 3 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/src/h264vaapiencoder.cpp b/src/h264vaapiencoder.cpp +index 0cf251b4..eaec8dde 100644 +--- src/h264vaapiencoder.cpp ++++ src/h264vaapiencoder.cpp +@@ -18,6 +18,12 @@ extern "C" { + + #include "logging_record.h" + ++#ifndef AV_PROFILE_H264_BASELINE // ffmpeg before 8.0 ++#define AV_PROFILE_H264_BASELINE FF_PROFILE_H264_BASELINE ++#define AV_PROFILE_H264_MAIN FF_PROFILE_H264_MAIN ++#define AV_PROFILE_H264_HIGH FF_PROFILE_H264_HIGH ++#endif ++ + H264VAAPIEncoder::H264VAAPIEncoder(H264Profile profile, PipeWireProduce *produce) + : HardwareEncoder(produce) + , m_profile(profile) +@@ -130,13 +136,13 @@ bool H264VAAPIEncoder::initialize(const QSize &size) + + switch (m_profile) { + case H264Profile::Baseline: +- m_avCodecContext->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; ++ m_avCodecContext->profile = AV_PROFILE_H264_CONSTRAINED_BASELINE; + break; + case H264Profile::Main: +- m_avCodecContext->profile = FF_PROFILE_H264_MAIN; ++ m_avCodecContext->profile = AV_PROFILE_H264_MAIN; + break; + case H264Profile::High: +- m_avCodecContext->profile = FF_PROFILE_H264_HIGH; ++ m_avCodecContext->profile = AV_PROFILE_H264_HIGH; + break; + } + +diff --git a/src/libopenh264encoder.cpp b/src/libopenh264encoder.cpp +index db6ed4db..294c0f2b 100644 +--- src/libopenh264encoder.cpp ++++ src/libopenh264encoder.cpp +@@ -21,6 +21,12 @@ extern "C" { + + #include "logging_record.h" + ++#ifndef AV_PROFILE_H264_BASELINE // ffmpeg before 8.0 ++#define AV_PROFILE_H264_CONSTRAINED_BASELINE FF_PROFILE_H264_CONSTRAINED_BASELINE ++#define AV_PROFILE_H264_MAIN FF_PROFILE_H264_MAIN ++#define AV_PROFILE_H264_HIGH FF_PROFILE_H264_HIGH ++#endif ++ + LibOpenH264Encoder::LibOpenH264Encoder(H264Profile profile, PipeWireProduce *produce) + : SoftwareEncoder(produce) + , m_profile(profile) +@@ -64,13 +70,13 @@ bool LibOpenH264Encoder::initialize(const QSize &size) + // passes that through, but libopenh264 only allows BASELINE. + // Until that bug is fixed there'll always be a warning that the + // profile is not supported (https://github.com/cisco/openh264/issues/3613) +- m_avCodecContext->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; ++ m_avCodecContext->profile = AV_PROFILE_H264_CONSTRAINED_BASELINE; + break; + case H264Profile::Main: +- m_avCodecContext->profile = FF_PROFILE_H264_MAIN; ++ m_avCodecContext->profile = AV_PROFILE_H264_MAIN; + break; + case H264Profile::High: +- m_avCodecContext->profile = FF_PROFILE_H264_HIGH; ++ m_avCodecContext->profile = AV_PROFILE_H264_HIGH; + break; + } + +diff --git a/src/libx264encoder.cpp b/src/libx264encoder.cpp +index d9fe44f4..a8f0e21f 100644 +--- src/libx264encoder.cpp ++++ src/libx264encoder.cpp +@@ -20,6 +20,12 @@ extern "C" { + + #include "logging_record.h" + ++#ifndef AV_PROFILE_H264_BASELINE // ffmpeg before 8.0 ++#define AV_PROFILE_H264_BASELINE FF_PROFILE_H264_BASELINE ++#define AV_PROFILE_H264_MAIN FF_PROFILE_H264_MAIN ++#define AV_PROFILE_H264_HIGH FF_PROFILE_H264_HIGH ++#endif ++ + using namespace Qt::StringLiterals; + + LibX264Encoder::LibX264Encoder(H264Profile profile, PipeWireProduce *produce) +@@ -68,13 +74,13 @@ bool LibX264Encoder::initialize(const QSize &size) + + switch (m_profile) { + case H264Profile::Baseline: +- m_avCodecContext->profile = FF_PROFILE_H264_BASELINE; ++ m_avCodecContext->profile = AV_PROFILE_H264_BASELINE; + break; + case H264Profile::Main: +- m_avCodecContext->profile = FF_PROFILE_H264_MAIN; ++ m_avCodecContext->profile = AV_PROFILE_H264_MAIN; + break; + case H264Profile::High: +- m_avCodecContext->profile = FF_PROFILE_H264_HIGH; ++ m_avCodecContext->profile = AV_PROFILE_H264_HIGH; + break; + } + +-- +GitLab + |