From acdd2fb3c1c56a772b8e85019d1e635c592e86e3 Mon Sep 17 00:00:00 2001
From: simon <me@simon987.net>
Date: Mon, 6 Jan 2020 16:25:34 -0500
Subject: [PATCH] Use bundled ffmpeg libraries

---
 CMakeLists.txt    | 15 +++------------
 src/parsing/doc.c |  2 +-
 src/sist.h        | 10 +++++-----
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdbc44c..1ffa960 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,6 @@ endif ()
 find_package(PkgConfig REQUIRED)
 set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig/")
 
-find_package(LibMagic REQUIRED)
-find_package(FFmpeg REQUIRED)
 find_package(OpenSSL REQUIRED)
 find_package(Freetype REQUIRED)
 
@@ -95,7 +93,6 @@ pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
 pkg_check_modules(UUID REQUIRED uuid)
 
-add_definitions(${LIBMAGIC_CFLAGS_OTHER})
 add_definitions(${UUID_CFLAGS_OTHER})
 add_definitions(${GLIB_CFLAGS_OTHER})
 add_definitions(${GOBJECT_CFLAGS_OTHER})
@@ -108,11 +105,9 @@ list(REMOVE_ITEM UUID_LIBRARIES pcre)
 if (WITH_SIST2)
     target_include_directories(
             sist2 PUBLIC
-            ${LIBMAGIC_INCLUDE_DIRS}
             ${GOBJECT_INCLUDE_DIRS}
-            ${OPENSSL_INCLUDE_DIR}
-            ${FFMPEG_INCLUDE_DIRS}
             ${GLIB_INCLUDE_DIRS}
+            ${PROJECT_SOURCE_DIR}/lib/ffmpeg/
             ${FREETYPE_INCLUDE_DIRS}
             ${UUID_INCLUDE_DIRS}
             ${PROJECT_SOURCE_DIR}/
@@ -125,7 +120,6 @@ if (WITH_SIST2)
     target_link_directories(
             sist2 PUBLIC
             ${UUID_LIBRARY_DIRS}
-            ${FFMPEG_LIBRARY_DIRS}
     )
 
 
@@ -150,8 +144,6 @@ if (WITH_SIST2)
             ${PROJECT_SOURCE_DIR}/lib/libavutil.a
             ${PROJECT_SOURCE_DIR}/lib/libswscale.a
             ${PROJECT_SOURCE_DIR}/lib/libswresample.a
-            #        ${FFMPEG_LIBRARIES}
-            #        swscale
 
             # mupdf
             ${PROJECT_SOURCE_DIR}/lib/libmupdf.a
@@ -164,7 +156,7 @@ if (WITH_SIST2)
             curl
             m
             bz2
-            magic
+            ${PROJECT_SOURCE_DIR}/lib/libmagic.a
             ${PROJECT_SOURCE_DIR}/lib/libharfbuzz.a
             ${PROJECT_SOURCE_DIR}/lib/libopenjp2.a
             freetype
@@ -196,7 +188,7 @@ if (WITH_SIST2_SCAN)
             ${LIBMAGIC_INCLUDE_DIRS}
             ${GOBJECT_INCLUDE_DIRS}
             ${OPENSSL_INCLUDE_DIR}
-            ${FFMPEG_INCLUDE_DIRS}
+            ${PROJECT_SOURCE_DIR}/lib/ffmpeg/
             ${GLIB_INCLUDE_DIRS}
             ${UUID_INCLUDE_DIRS}
             ${FREETYPE_INCLUDE_DIRS}
@@ -210,7 +202,6 @@ if (WITH_SIST2_SCAN)
     target_link_directories(
             sist2_scan PUBLIC
             ${UUID_LIBRARY_DIRS}
-            ${FFMPEG_LIBRARY_DIRS}
     )
     target_compile_options(sist2_scan
             PRIVATE
diff --git a/src/parsing/doc.c b/src/parsing/doc.c
index fe2ed1a..1106e3a 100644
--- a/src/parsing/doc.c
+++ b/src/parsing/doc.c
@@ -1,7 +1,7 @@
 #include "doc.h"
 #include "src/ctx.h"
 
-static void dump_text(mceTextReader_t *reader, dyn_buffer_t *buf) {
+void dump_text(mceTextReader_t *reader, dyn_buffer_t *buf) {
 
     mce_skip_attributes(reader);
 
diff --git a/src/sist.h b/src/sist.h
index c038846..d1683f7 100644
--- a/src/sist.h
+++ b/src/sist.h
@@ -12,11 +12,11 @@
 #include <ftw.h>
 #include <uuid.h>
 #include <magic.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#include <libswresample/swresample.h>
-#include <libavcodec/avcodec.h>
-#include <libavutil/imgutils.h>
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
+#include "libswresample/swresample.h"
+#include "libavcodec/avcodec.h"
+#include "libavutil/imgutils.h"
 #include <ctype.h>
 #include <mupdf/fitz.h>
 #include <mupdf/pdf.h>