X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fenvironment_info.cc;h=5b1f56f727e279122211616742cb4598ad0cce32;hb=290d6d7a61aadda3f6d317465507caa7ffac1ba2;hp=462e8f11fc532b90d3ca2c43bbc756a1a90ab22e;hpb=32911ed3ec57ef9680bfd255fbbe78e8df926f7d;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 462e8f11f..5b1f56f72 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -24,24 +24,10 @@
 #include "cross.h"
 #include <dcp/version.h>
 #include <libssh/libssh.h>
-#ifdef DCPOMATIC_IMAGE_MAGICK
-/* ImageMagick */
-#ifdef DCPOMATIC_MAGICKCORE_MAGICK
-#include <magick/MagickCore.h>
-#include <magick/version.h>
-#else
-#include <MagickCore/MagickCore.h>
-#include <MagickCore/version.h>
-#endif
-#else
-/* GraphicsMagick */
-#include <magick/common.h>
-#include <magick/magick_config.h>
-#include <magick/version.h>
-#endif
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 }
@@ -49,13 +35,10 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::list;
 using std::pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param v Version as used by FFmpeg.
  *  @return A string representation of v.
@@ -76,13 +59,12 @@ dependency_version_summary ()
 {
 	char buffer[512];
 	snprintf (
-		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, %s, libssh %s, libdcp %s git %s",
+		buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, libssh %s, libdcp %s git %s",
 		ffmpeg_version_to_string(avcodec_version()).c_str(),
 		ffmpeg_version_to_string(avfilter_version()).c_str(),
 		ffmpeg_version_to_string(avformat_version()).c_str(),
 		ffmpeg_version_to_string(avutil_version()).c_str(),
 		ffmpeg_version_to_string(swscale_version()).c_str(),
-		MagickVersion,
 		ssh_version(0),
 		dcp::version, dcp::git_commit
 		);
@@ -143,9 +125,11 @@ environment_info ()
 
 #if __GNUC__
 #if __x86_64__
-	info.push_back ("Built for 64-bit");
+	info.push_back ("Built for x86 64-bit");
+#elif __aarch64__
+	info.push_back ("Built for ARM 64-bit");
 #else
-	info.push_back ("Built for 32-bit");
+	info.push_back ("Built for x86 32-bit");
 #endif
 #endif