libhb: resolve header conflicts with pango/harfbuzz

Newest versions appear to have a "common.h" somewhere that is interfering with libhb/common.h. move headers into "handbrake" subdirectory
Jacky342 · Sep 12, 2019 · 1b79484 · 1b79484
1 parent a7f5488
commit 1b79484
Show file tree

Hide file tree

Showing 162 changed files with 314 additions and 318 deletions.
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
@@ -74,7 +74,7 @@
 #include <dbt.h>
 #endif
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "callbacks.h"
 #include "chapters.h"
 #include "queuehandler.h"

diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "values.h"
 #include "settings.h"
 

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <math.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
@@ -39,7 +39,7 @@
 #include "preview.h"
 #include "presets.h"
 #include "values.h"
-#include "lang.h"
+#include "handbrake/lang.h"
 #include "jansson.h"
 
 typedef struct

diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
@@ -26,8 +26,8 @@
 
 #include "values.h"
 #include "settings.h"
-#include "handbrake.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
 
 enum
 {

diff --git a/gtk/src/main.c b/gtk/src/main.c
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "renderer_button.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"
@@ -40,7 +40,7 @@
 #include "resources.h"
 #include "presets.h"
 #include "values.h"
-#include "lang.h"
+#include "handbrake/lang.h"
 #include "videohandler.h"
 
 #define MAX_NESTED_PRESET 3

diff --git a/gtk/src/presets.h b/gtk/src/presets.h
@@ -24,7 +24,7 @@
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "values.h"
 
 void ghb_presets_load(signal_user_data_t *ud);

diff --git a/gtk/src/preview.c b/gtk/src/preview.c
@@ -43,7 +43,7 @@
 #include "preview.h"
 #include "values.h"
 #include "queuehandler.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #define PREVIEW_STATE_IMAGE 0
 #define PREVIEW_STATE_LIVE 1

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/gtk/src/values.h b/gtk/src/values.h
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "hb_dict.h"
+#include "handbrake/hb_dict.h"
 
 #define GHB_DICT    HB_VALUE_TYPE_DICT
 #define GHB_ARRAY   HB_VALUE_TYPE_ARRAY

diff --git a/libhb/audio_remap.c b/libhb/audio_remap.c
@@ -7,9 +7,9 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbffmpeg.h"
-#include "audio_remap.h"
+#include "handbrake/common.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_remap.h"
 
 // source: libavutil/channel_layout.h
 hb_chan_map_t hb_libav_chan_map =

diff --git a/libhb/audio_resample.c b/libhb/audio_resample.c
@@ -7,9 +7,9 @@
  * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbffmpeg.h"
-#include "audio_resample.h"
+#include "handbrake/common.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_resample.h"
 
 hb_audio_resample_t* hb_audio_resample_init(enum AVSampleFormat sample_fmt,
                                             int sample_rate,

diff --git a/libhb/avfilter.c b/libhb/avfilter.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "hbavfilter.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/hbavfilter.h"
+#include "handbrake/avfilter_priv.h"
 
 static int  avfilter_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 static int  avfilter_post_init( hb_filter_object_t * filter, hb_job_t * job );

diff --git a/libhb/batch.c b/libhb/batch.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "lang.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
 
 struct hb_batch_s
 {

diff --git a/libhb/bd.c b/libhb/bd.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "lang.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/lang.h"
+#include "handbrake/hbffmpeg.h"
 
 #include "libbluray/bluray.h"
 

diff --git a/libhb/chroma_smooth.c b/libhb/chroma_smooth.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 
 #define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25
 #define CHROMA_SMOOTH_SIZE_DEFAULT 7

diff --git a/libhb/colormap.c b/libhb/colormap.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <strings.h>
-#include "colormap.h"
+#include "handbrake/colormap.h"
 
 typedef struct
 {

diff --git a/libhb/colorspace.c b/libhb/colorspace.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int colorspace_init(hb_filter_object_t * filter,
                            hb_filter_init_t * init);

diff --git a/libhb/comb_detect.c b/libhb/comb_detect.c
@@ -28,8 +28,8 @@ Original "Faster" settings:
 #define FILTER_CLASSIC 1
 #define FILTER_ERODE_DILATE 2
 
-#include "handbrake.h"
-#include "taskset.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/taskset.h"
 
 typedef struct decomb_thread_arg_s {
     hb_filter_private_t *pv;

diff --git a/libhb/common.c b/libhb/common.c
@@ -12,15 +12,15 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "handbrake.h"
+#include "handbrake/handbrake.h"
 #include "x264.h"
-#include "lang.h"
-#include "common.h"
-#include "h264_common.h"
-#include "h265_common.h"
-#include "encx264.h"
+#include "handbrake/lang.h"
+#include "handbrake/common.h"
+#include "handbrake/h264_common.h"
+#include "handbrake/h265_common.h"
+#include "handbrake/encx264.h"
 #if HB_PROJECT_FEATURE_QSV
-#include "qsv_common.h"
+#include "handbrake/qsv_common.h"
 #endif
 
 #if HB_PROJECT_FEATURE_X265
@@ -32,10 +32,10 @@
 #endif
 
 #if HB_PROJECT_FEATURE_NVENC
-#include "nvenc_common.h"
+#include "handbrake/nvenc_common.h"
 #endif
 #if HB_PROJECT_FEATURE_VCE
-#include "vce_common.h"
+#include "handbrake/vce_common.h"
 #endif
 
 #ifdef __APPLE__

diff --git a/libhb/compat.c b/libhb/compat.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "compat.h"
+#include "handbrake/compat.h"
 
 #ifdef HB_NEED_STRTOK_R
 #include <string.h>

diff --git a/libhb/cropscale.c b/libhb/cropscale.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int crop_scale_init(hb_filter_object_t * filter,
                            hb_filter_init_t * init);

diff --git a/libhb/deblock.c b/libhb/deblock.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "common.h"
-#include "avfilter_priv.h"
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
 
 static int deblock_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
@@ -38,20 +38,20 @@
     VC1 decoder) can't easily be used by the HB mpeg stream reader.
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "hbavfilter.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/hbavfilter.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"
 #include "libavfilter/buffersink.h"
 #include "libavutil/hwcontext.h"
-#include "lang.h"
-#include "audio_resample.h"
+#include "handbrake/lang.h"
+#include "handbrake/audio_resample.h"
 
 #if HB_PROJECT_FEATURE_QSV
 #include "libavutil/hwcontext_qsv.h"
-#include "qsv_common.h"
-#include "qsv_libav.h"
+#include "handbrake/qsv_common.h"
+#include "handbrake/qsv_libav.h"
 #endif
 
 static void compute_frame_duration( hb_work_private_t *pv );

diff --git a/libhb/deccc608sub.c b/libhb/deccc608sub.c
@@ -13,8 +13,8 @@
  *
  * Note that the SRT sub generation from CC could be useful for mkv subs.
  */
-#include "handbrake.h"
-#include "deccc608sub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/deccc608sub.h"
 
 #define SSA_PREAMBLE_LEN 24
 /*

diff --git a/libhb/declpcm.c b/libhb/declpcm.c
@@ -7,9 +7,9 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "audio_resample.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/audio_resample.h"
 
 struct hb_work_private_s
 {

diff --git a/libhb/decomb.c b/libhb/decomb.c
@@ -54,11 +54,11 @@ which will feed EEDI2 interpolations to yadif.
 12-15: EEDI2 will override cubic interpolation
 *****/
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
-#include "eedi2.h"
-#include "taskset.h"
-#include "decomb.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/eedi2.h"
+#include "handbrake/taskset.h"
+#include "handbrake/decomb.h"
 
 #define PARITY_DEFAULT   -1
 

diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c
@@ -7,8 +7,8 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "handbrake.h"
-#include "hbffmpeg.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
 
 struct hb_work_private_s
 {

diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
@@ -12,9 +12,9 @@
 #include <string.h>
 #include <iconv.h>
 #include <errno.h>
-#include "handbrake.h"
-#include "colormap.h"
-#include "decsrtsub.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/colormap.h"
+#include "handbrake/decsrtsub.h"
 
 struct start_and_end {
     unsigned long start, end;