avidemux-plugins: Fix building on NetBSD

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: avidemux-plugins: Fix building on NetBSD
From: Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Date: Sun, 08 Jan 2023 22:29:13 +0000
Module Name:	pkgsrc-wip
Committed By:	Frédéric Fauberteau <triaxx%NetBSD.org@localhost>
Pushed By:	frederic
Date:		Sun Jan 8 23:29:13 2023 +0100
Changeset:	caf2ce5cfcfc3605846a15330b758ce6cb0a60b4

Modified Files:
	avidemux-plugins/PLIST
	avidemux-plugins/distinfo
Added Files:
	avidemux-plugins/PLIST.Darwin
	avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp
	avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_CMakeLists.txt

Log Message:
avidemux-plugins: Fix building on NetBSD

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=caf2ce5cfcfc3605846a15330b758ce6cb0a60b4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 avidemux-plugins/PLIST                               | 20 +++++++++++++++-----
 avidemux-plugins/PLIST.Darwin                        |  6 ++++++
 avidemux-plugins/distinfo                            |  2 ++
 ..._plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp | 20 ++++++++++++++++++++
 ...mux__plugins_ADM__audioDevices_Oss_CMakeLists.txt | 16 ++++++++++++++++
 5 files changed, 59 insertions(+), 5 deletions(-)

diffs:
diff --git a/avidemux-plugins/PLIST b/avidemux-plugins/PLIST
index f32c9fac85..116ec72bf4 100644
--- a/avidemux-plugins/PLIST
+++ b/avidemux-plugins/PLIST
@@ -12,7 +12,11 @@ ${PLIST.opencore-amr}lib/ADM_plugins6/audioDecoder/libADM_ad_opencore_amrwb.${SO
 ${PLIST.opus}lib/ADM_plugins6/audioDecoder/libADM_ad_opus.${SOEXT}
 lib/ADM_plugins6/audioDecoder/libADM_ad_ulaw.${SOEXT}
 ${PLIST.vorbis}lib/ADM_plugins6/audioDecoder/libADM_ad_vorbis.${SOEXT}
-lib/ADM_plugins6/audioDevices/libADM_av_audioCore.${SOEXT}
+${PLIST.alsa}lib/ADM_plugins6/audioDevices/libADM_av_alsaDMix.${SOEXT}
+${PLIST.alsa}lib/ADM_plugins6/audioDevices/libADM_av_alsaDefault.${SOEXT}
+${PLIST.alsa}lib/ADM_plugins6/audioDevices/libADM_av_alsaHw.${SOEXT}
+${PLIST.oss}lib/ADM_plugins6/audioDevices/libADM_av_oss.${SOEXT}
+${PLIST.pulseaudio}lib/ADM_plugins6/audioDevices/libADM_av_pulseAudio.${SOEXT}
 ${PLIST.jack}lib/ADM_plugins6/audioDevices/libADM_av_jack.${SOEXT}
 ${PLIST.aften}lib/ADM_plugins6/audioEncoders/libADM_ae_aften.${SOEXT}
 ${PLIST.faac}lib/ADM_plugins6/audioEncoders/libADM_ae_faac.${SOEXT}
@@ -69,20 +73,19 @@ lib/ADM_plugins6/videoEncoders/libADM_ve_ffDv.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.${SOEXT}
-lib/ADM_plugins6/videoEncoders/libADM_ve_ffVTEencH264.${SOEXT}
-lib/ADM_plugins6/videoEncoders/libADM_ve_ffVTEencHEVC.${SOEXT}
+${PLIST.vaapi}lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.${SOEXT}
+${PLIST.vaapi}lib/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_ffv1.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_huff.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_jpeg.${SOEXT}
+${PLIST.vaapi}lib/ADM_plugins6/videoEncoders/libADM_ve_libva.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_null.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_utvideo.${SOEXT}
 ${PLIST.libvpx}lib/ADM_plugins6/videoEncoders/libADM_ve_vp9.${SOEXT}
 ${PLIST.xvid}lib/ADM_plugins6/videoEncoders/libADM_ve_xvid4.${SOEXT}
 ${PLIST.x264}lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.${SOEXT}
-${PLIST.x265}lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.${SOEXT}
 lib/ADM_plugins6/videoEncoders/libADM_ve_yv12.${SOEXT}
 ${PLIST.qt5}${PLIST.x264}lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.${SOEXT}
-${PLIST.qt5}${PLIST.x265}lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.${SOEXT}
 ${PLIST.aom}lib/ADM_plugins6/videoDecoders/libADM_vd_aom.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.${SOEXT}
@@ -123,6 +126,11 @@ ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_quadTransCli.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.${SOEXT}
+${PLIST.notdarwin}lib/ADM_plugins6/videoFilters/libADM_vf_avsfilter.so
+${PLIST.vaapi}lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.${SOEXT}
+${PLIST.vaapi}lib/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.${SOEXT}
+${PLIST.vdpau}lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.${SOEXT}
+${PLIST.vdpau}lib/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_waveletDenoiseCli.${SOEXT}
 ${PLIST.cli}lib/ADM_plugins6/videoFilters/cli/libADM_vf_waveletSharpCli.${SOEXT}
 lib/ADM_plugins6/videoFilters/libADM_vf_DgBob.${SOEXT}
@@ -213,3 +221,5 @@ ${PLIST.qt5}lib/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.${SOEXT
 ${PLIST.qt5}lib/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletDenoiseQT5.${SOEXT}
 ${PLIST.qt5}lib/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletSharpQT5.${SOEXT}
 ${PLIST.qt5}lib/ADM_plugins6/videoFilters/qt5/libADM_vf_zoomQT5.${SOEXT}
+${PLIST.notdarwin}share/ADM6_addons/avsfilter/avsload.exe
+${PLIST.notdarwin}share/ADM6_addons/avsfilter/pipe_source.dll
diff --git a/avidemux-plugins/PLIST.Darwin b/avidemux-plugins/PLIST.Darwin
new file mode 100644
index 0000000000..f0ade77929
--- /dev/null
+++ b/avidemux-plugins/PLIST.Darwin
@@ -0,0 +1,6 @@
+lib/ADM_plugins6/audioDevices/libADM_av_audioCore.dylib
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffVTEencH264.dylib
+lib/ADM_plugins6/videoEncoders/libADM_ve_ffVTEencHEVC.dylib
+lib/ADM_plugins6/videoEncoders/libADM_ve_x265_other.dylib
+lib/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.dylib
+
diff --git a/avidemux-plugins/distinfo b/avidemux-plugins/distinfo
index 2a9c4007c8..615f1ece60 100644
--- a/avidemux-plugins/distinfo
+++ b/avidemux-plugins/distinfo
@@ -3,4 +3,6 @@ $NetBSD$
 BLAKE2s (avidemux_2.8.1.tar.gz) = 6fb2f7f1f0686ac0fb60374e16347aaf1fdbc6f478369d564f27546ee69cb4aa
 SHA512 (avidemux_2.8.1.tar.gz) = c8df5c0d7f20fd9003560dee7cc0964ba810fc2786cefd525c09fd9f740339dd92a42989938ca48c16aca778ed5bd93a56572b0c6397fe04e47225cc109e7d75
 Size (avidemux_2.8.1.tar.gz) = 26126065 bytes
+SHA1 (patch-avidemux__plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp) = 20f346b953d61d8640c2c36e6731e2bef85fa845
+SHA1 (patch-avidemux__plugins_ADM__audioDevices_Oss_CMakeLists.txt) = 4f6bba0618e3015041a833c9eb1d87fede52b9e3
 SHA1 (patch-avidemux__plugins_CMakeLists.txt) = e7ad920a45a2906ba2c405d6083b80c503fb7cf9
diff --git a/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp b/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp
new file mode 100644
index 0000000000..6dfdaee114
--- /dev/null
+++ b/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_ADM__deviceoss.cpp
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Add support for NetBSD.
+
+--- avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp.orig	2022-09-17 13:59:17.000000000 +0000
++++ avidemux_plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp
+@@ -18,11 +18,11 @@
+ #include "ADM_default.h"
+ 
+ 
+-#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+ 	#include <soundcard.h>
+ 	const char *dsp = DEVOSSAUDIO;;
+ 
+-#elif defined(__OpenBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ 	#include <soundcard.h>
+ 	const char *dsp = "/dev/audio";
+ 	const char *device_mixer = "/dev/mixer";
diff --git a/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_CMakeLists.txt b/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_CMakeLists.txt
new file mode 100644
index 0000000000..7aa74c3a1b
--- /dev/null
+++ b/avidemux-plugins/patches/patch-avidemux__plugins_ADM__audioDevices_Oss_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Add -lossaudio for NetBSD.
+
+--- avidemux_plugins/ADM_audioDevices/Oss/CMakeLists.txt.orig	2022-09-17 13:59:17.000000000 +0000
++++ avidemux_plugins/ADM_audioDevices/Oss/CMakeLists.txt
+@@ -4,6 +4,9 @@ INCLUDE(av_plugin)
+ SET(ADM_av_oss_SRCS ADM_deviceoss.cpp)
+ 
+ ADD_AUDIO_DEVICE(ADM_av_oss  ${ADM_av_oss_SRCS})
++if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
++    TARGET_LINK_LIBRARIES(ADM_av_oss ossaudio)
++endif()
+ include_directories(${OSS_INCLUDE_DIR})
+ INIT_AUDIO_DEVICE(ADM_av_oss)
+ INSTALL_AUDIO_DEVICE(ADM_av_oss)
Prev by Date: avidemux-qt: Fix building on NetBSD
Next by Date: avidemux-plugins: Fix missing comment in PLIST
Previous by Thread: avidemux-qt: Fix building on NetBSD
Next by Thread: avidemux-plugins: Fix missing comment in PLIST
Indexes:
Home | Main Index | Thread Index | Old Index