Attachment 12646 Details for Bug 28776 – patch to build opencpn-weatherfax-plugin

[patch] patch to build opencpn-weatherfax-plugin

weatherfax_pi-system-audiofile.patch (text/plain), 4.37 KB, created by Philippe Didier on 2021-04-17 03:05:28 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2021-04-17 03:05:28 CEST

Size: 4.37 KB

patch

obsolete

>diff -ur weatherfax_pi_o/CMakeLists.txt weatherfax_pi_n/CMakeLists.txt
>--- weatherfax_pi_o/CMakeLists.txt	2019-04-18 22:35:52.000000000 +0100
>+++ weatherfax_pi_n/CMakeLists.txt	2019-04-18 22:51:31.361952497 +0100
>@@ -42,6 +42,8 @@
>     INCLUDE_DIRECTORIES(BEFORE ${PLUGIN_SOURCE_DIR}/include/msvc)
> ENDIF (MSVC)
> 
>+SET(EXTRA_LIBS ${EXTRA_LIBS} -lwx_gtk2u_adv-3.0 -laudiofile)
>+
> INCLUDE("cmake/PluginConfigure.cmake")
> 
> SET(SRC_WEATHERFAX
>@@ -58,74 +60,6 @@
>             src/icons.cpp
> 
>             src/wximgkap.cpp
>-	)
>-
>-SET(SRC_AUDIOFILE
>-            src/libaudiofile/aupv.c
>-            src/libaudiofile/error.c
>-            src/libaudiofile/extended.c
>-            src/libaudiofile/g711.c
>- 
>-            src/libaudiofile/AIFF.cpp
>-            src/libaudiofile/AVR.cpp
>-            src/libaudiofile/CAF.cpp
>-            src/libaudiofile/IFF.cpp
>-            src/libaudiofile/IRCAM.cpp
>-            src/libaudiofile/NIST.cpp
>-            src/libaudiofile/NeXT.cpp
>-            src/libaudiofile/Raw.cpp
>-            src/libaudiofile/SampleVision.cpp
>-            src/libaudiofile/VOC.cpp
>-
>-            src/libaudiofile/AudioFormat.cpp
>-            src/libaudiofile/Buffer.cpp
>-            src/libaudiofile/FLACFile.cpp
>-            src/libaudiofile/File.cpp
>-            src/libaudiofile/FileHandle.cpp
>-            src/libaudiofile/Instrument.cpp
>-            src/libaudiofile/Loop.cpp
>-            src/libaudiofile/Marker.cpp
>-            src/libaudiofile/Miscellaneous.cpp
>-            src/libaudiofile/Setup.cpp
>-            src/libaudiofile/Track.cpp
>-            src/libaudiofile/UUID.cpp
>-            src/libaudiofile/WAVE.cpp
>-            src/libaudiofile/aes.cpp
>-            src/libaudiofile/af_vfs.cpp
>-            src/libaudiofile/compression.cpp
>-            src/libaudiofile/data.cpp
>-            src/libaudiofile/debug.cpp
>-            src/libaudiofile/format.cpp
>-            src/libaudiofile/openclose.cpp
>-            src/libaudiofile/PacketTable.cpp
>-            src/libaudiofile/pcm.cpp
>-            src/libaudiofile/query.cpp
>-            src/libaudiofile/units.cpp
>-            src/libaudiofile/util.cpp
>-
>-            src/libaudiofile/alac/ALACEncoder.cpp
>-            src/libaudiofile/alac/ALACDecoder.cpp
>-            src/libaudiofile/alac/ag_dec.c
>-            src/libaudiofile/alac/ag_enc.c
>-            src/libaudiofile/alac/ALACBitUtilities.c
>-            src/libaudiofile/alac/dp_dec.c
>-            src/libaudiofile/alac/dp_enc.c
>-            src/libaudiofile/alac/EndianPortable.c
>-            src/libaudiofile/alac/matrix_dec.c
>-            src/libaudiofile/alac/matrix_enc.c
>-            
>-            src/libaudiofile/modules/ALAC.cpp
>-            src/libaudiofile/modules/BlockCodec.cpp            
>-            src/libaudiofile/modules/FLAC.cpp
>-            src/libaudiofile/modules/FileModule.cpp
>-            src/libaudiofile/modules/G711.cpp
>-            src/libaudiofile/modules/IMA.cpp
>-            src/libaudiofile/modules/MSADPCM.cpp
>-            src/libaudiofile/modules/Module.cpp
>-            src/libaudiofile/modules/ModuleState.cpp
>-            src/libaudiofile/modules/PCM.cpp
>-            src/libaudiofile/modules/RebufferModule.cpp
>-            src/libaudiofile/modules/SimpleModule.cpp
> )
> 
> IF(UNIX)
>diff -ur weatherfax_pi_o/src/InternetRetrievalDialog.cpp weatherfax_pi_n/src/InternetRetrievalDialog.cpp
>--- weatherfax_pi_o/src/InternetRetrievalDialog.cpp	2019-04-18 22:35:52.000000000 +0100
>+++ weatherfax_pi_n/src/InternetRetrievalDialog.cpp	2019-04-18 23:00:14.029262433 +0100
>@@ -33,7 +33,7 @@
> 
> #include <list>
> 
>-#include "tinyxml/tinyxml.h"
>+#include <tinyxml.h>
> 
> #include "weatherfax_pi.h"
> #include "WeatherFaxImage.h"
>diff -ur weatherfax_pi_o/src/SchedulesDialog.cpp weatherfax_pi_n/src/SchedulesDialog.cpp
>--- weatherfax_pi_o/src/SchedulesDialog.cpp	2019-04-18 22:35:52.000000000 +0100
>+++ weatherfax_pi_n/src/SchedulesDialog.cpp	2019-04-18 23:03:04.733231780 +0100
>@@ -30,7 +30,7 @@
> 
> #include <list>
> 
>-#include "tinyxml/tinyxml.h"
>+#include <tinyxml.h>
> 
> #include "weatherfax_pi.h"
> #include "WeatherFaxImage.h"
>diff -ur weatherfax_pi_o/src/WeatherFax.cpp weatherfax_pi_n/src/WeatherFax.cpp
>--- weatherfax_pi_o/src/WeatherFax.cpp	2019-04-18 22:35:52.000000000 +0100
>+++ weatherfax_pi_n/src/WeatherFax.cpp	2019-04-18 23:04:00.582891287 +0100
>@@ -26,7 +26,7 @@
> 
> #include <list>
> 
>-#include "tinyxml/tinyxml.h"
>+#include <tinyxml.h>
> 
> #include "weatherfax_pi.h"
> #include "WeatherFaxImage.h"

diff -ur weatherfax_pi_o/CMakeLists.txt weatherfax_pi_n/CMakeLists.txt
--- weatherfax_pi_o/CMakeLists.txt	2019-04-18 22:35:52.000000000 +0100
+++ weatherfax_pi_n/CMakeLists.txt	2019-04-18 22:51:31.361952497 +0100
@@ -42,6 +42,8 @@
     INCLUDE_DIRECTORIES(BEFORE ${PLUGIN_SOURCE_DIR}/include/msvc)
 ENDIF (MSVC)
 
+SET(EXTRA_LIBS ${EXTRA_LIBS} -lwx_gtk2u_adv-3.0 -laudiofile)
+
 INCLUDE("cmake/PluginConfigure.cmake")
 
 SET(SRC_WEATHERFAX
@@ -58,74 +60,6 @@
             src/icons.cpp
 
             src/wximgkap.cpp
-	)
-
-SET(SRC_AUDIOFILE
-            src/libaudiofile/aupv.c
-            src/libaudiofile/error.c
-            src/libaudiofile/extended.c
-            src/libaudiofile/g711.c
- 
-            src/libaudiofile/AIFF.cpp
-            src/libaudiofile/AVR.cpp
-            src/libaudiofile/CAF.cpp
-            src/libaudiofile/IFF.cpp
-            src/libaudiofile/IRCAM.cpp
-            src/libaudiofile/NIST.cpp
-            src/libaudiofile/NeXT.cpp
-            src/libaudiofile/Raw.cpp
-            src/libaudiofile/SampleVision.cpp
-            src/libaudiofile/VOC.cpp
-
-            src/libaudiofile/AudioFormat.cpp
-            src/libaudiofile/Buffer.cpp
-            src/libaudiofile/FLACFile.cpp
-            src/libaudiofile/File.cpp
-            src/libaudiofile/FileHandle.cpp
-            src/libaudiofile/Instrument.cpp
-            src/libaudiofile/Loop.cpp
-            src/libaudiofile/Marker.cpp
-            src/libaudiofile/Miscellaneous.cpp
-            src/libaudiofile/Setup.cpp
-            src/libaudiofile/Track.cpp
-            src/libaudiofile/UUID.cpp
-            src/libaudiofile/WAVE.cpp
-            src/libaudiofile/aes.cpp
-            src/libaudiofile/af_vfs.cpp
-            src/libaudiofile/compression.cpp
-            src/libaudiofile/data.cpp
-            src/libaudiofile/debug.cpp
-            src/libaudiofile/format.cpp
-            src/libaudiofile/openclose.cpp
-            src/libaudiofile/PacketTable.cpp
-            src/libaudiofile/pcm.cpp
-            src/libaudiofile/query.cpp
-            src/libaudiofile/units.cpp
-            src/libaudiofile/util.cpp
-
-            src/libaudiofile/alac/ALACEncoder.cpp
-            src/libaudiofile/alac/ALACDecoder.cpp
-            src/libaudiofile/alac/ag_dec.c
-            src/libaudiofile/alac/ag_enc.c
-            src/libaudiofile/alac/ALACBitUtilities.c
-            src/libaudiofile/alac/dp_dec.c
-            src/libaudiofile/alac/dp_enc.c
-            src/libaudiofile/alac/EndianPortable.c
-            src/libaudiofile/alac/matrix_dec.c
-            src/libaudiofile/alac/matrix_enc.c
-            
-            src/libaudiofile/modules/ALAC.cpp
-            src/libaudiofile/modules/BlockCodec.cpp            
-            src/libaudiofile/modules/FLAC.cpp
-            src/libaudiofile/modules/FileModule.cpp
-            src/libaudiofile/modules/G711.cpp
-            src/libaudiofile/modules/IMA.cpp
-            src/libaudiofile/modules/MSADPCM.cpp
-            src/libaudiofile/modules/Module.cpp
-            src/libaudiofile/modules/ModuleState.cpp
-            src/libaudiofile/modules/PCM.cpp
-            src/libaudiofile/modules/RebufferModule.cpp
-            src/libaudiofile/modules/SimpleModule.cpp
 )
 
 IF(UNIX)
diff -ur weatherfax_pi_o/src/InternetRetrievalDialog.cpp weatherfax_pi_n/src/InternetRetrievalDialog.cpp
--- weatherfax_pi_o/src/InternetRetrievalDialog.cpp	2019-04-18 22:35:52.000000000 +0100
+++ weatherfax_pi_n/src/InternetRetrievalDialog.cpp	2019-04-18 23:00:14.029262433 +0100
@@ -33,7 +33,7 @@
 
 #include <list>
 
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
 
 #include "weatherfax_pi.h"
 #include "WeatherFaxImage.h"
diff -ur weatherfax_pi_o/src/SchedulesDialog.cpp weatherfax_pi_n/src/SchedulesDialog.cpp
--- weatherfax_pi_o/src/SchedulesDialog.cpp	2019-04-18 22:35:52.000000000 +0100
+++ weatherfax_pi_n/src/SchedulesDialog.cpp	2019-04-18 23:03:04.733231780 +0100
@@ -30,7 +30,7 @@
 
 #include <list>
 
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
 
 #include "weatherfax_pi.h"
 #include "WeatherFaxImage.h"
diff -ur weatherfax_pi_o/src/WeatherFax.cpp weatherfax_pi_n/src/WeatherFax.cpp
--- weatherfax_pi_o/src/WeatherFax.cpp	2019-04-18 22:35:52.000000000 +0100
+++ weatherfax_pi_n/src/WeatherFax.cpp	2019-04-18 23:04:00.582891287 +0100
@@ -26,7 +26,7 @@
 
 #include <list>
 
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
 
 #include "weatherfax_pi.h"
 #include "WeatherFaxImage.h"

Actions: View | Diff

Attachments on bug 28776: 12628 | 12629 | 12631 | 12633 | 12634 | 12635 | 12636 | 12637 | 12638 | 12640 | 12641 | 12642 | 12645 | 12646 | 12660 | 12674 | 12720 | 12721 | 12722