Commit 47353b65 authored by Niklas Haas's avatar Niklas Haas Committed by Hugo Beauzée-Luyssen
Browse files

libplacebo: move utils to new library

This will be reused by the other libplacebo components, and in
particular is required to avoid symbol collisions.
parent d8f89d45
......@@ -3,6 +3,12 @@ vout_LTLIBRARIES =
EXTRA_DIST += video_output/README
### libplacebo ###
if HAVE_LIBPLACEBO
include video_output/libplacebo/Makefile.am
endif
### OpenGL ###
include video_output/opengl/Makefile.am
if HAVE_DECKLINK
......
### libplacebo ###
LIBPLACEBO_COMMONSOURCES = video_output/libplacebo/utils.h
# Trigger the c++ linker because of glslang dependency of libplacebo
LIBPLACEBO_COMMONSOURCES += dummy.cpp
libplacebo_utils_la_SOURCES = $(LIBPLACEBO_COMMONSOURCES) \
video_output/libplacebo/utils.c
libplacebo_utils_la_CFLAGS = $(AM_CFLAGS) $(LIBPLACEBO_CFLAGS)
libplacebo_utils_la_LIBADD = $(LIBPLACEBO_LIBS)
libplacebo_utils_la_LDFLAGS = -static -undefined
noinst_LTLIBRARIES += libplacebo_utils.la
......@@ -27,7 +27,7 @@
#include <stdlib.h>
#include <vlc_common.h>
#include "placebo_utils.h"
#include "utils.h"
static void Log(void *priv, enum pl_log_level level, const char *msg)
{
......
/*****************************************************************************
* placebo_utils.h: Definition of various libplacebo helpers
* utils.h: Definition of various libplacebo helpers
*****************************************************************************
* Copyright (C) 2018 Niklas Haas
*
......
......@@ -23,13 +23,14 @@ OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
video_output/opengl/sampler_priv.h \
video_output/opengl/sub_renderer.c \
video_output/opengl/sub_renderer.h
if HAVE_LIBPLACEBO
OPENGL_COMMONSOURCES += video_output/placebo_utils.c video_output/placebo_utils.h
endif
OPENGL_COMMONCFLAGS = $(LIBPLACEBO_CFLAGS)
OPENGL_COMMONLIBS = $(LIBPLACEBO_LIBS)
if HAVE_LIBPLACEBO
OPENGL_COMMONLIBS += libplacebo_utils.la
endif
# Convenience library for OpenGL components -- OpenGL only
libvlc_opengl_la_SOURCES = $(OPENGL_COMMONSOURCES)
libvlc_opengl_la_CFLAGS = $(OPENGL_COMMONCFLAGS)
......
......@@ -31,7 +31,7 @@
#ifdef HAVE_LIBPLACEBO
#include <libplacebo/shaders.h>
#include <libplacebo/shaders/colorspace.h>
#include "../placebo_utils.h"
#include "../libplacebo/utils.h"
#endif
#include "gl_api.h"
......
......@@ -32,7 +32,7 @@
#include "gl_common.h"
#ifdef HAVE_LIBPLACEBO
#include "../placebo_utils.h"
#include "../libplacebo/utils.h"
#if PL_API_VER >= 10
......
......@@ -3,8 +3,8 @@
VULKAN_COMMONSOURCES = video_output/vulkan/instance.c \
video_output/vulkan/instance.h \
video_output/placebo_utils.c \
video_output/placebo_utils.h
video_output/libplacebo/utils.c \
video_output/libplacebo/utils.h
# Trigger the c++ linker because of glslang dependency of libplacebo
VULKAN_COMMONSOURCES += dummy.cpp
......
......@@ -31,7 +31,7 @@
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include "../placebo_utils.h"
#include "../libplacebo/utils.h"
#include "instance.h"
#include <libplacebo/renderer.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment