openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 19:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove hardcoded dependency of imlib2 on Xlib.

Browse Source 
patch by Víctor Paesa, wzrlpy arsystel com

Originally committed as revision 7829 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Víctor Paesa 2007-02-05 17:03:03 +00:00 committed by Diego Biurrun
parent e2ef53fc4f
commit 1b45e30404
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -1668,13 +1668,15 @@ fi
##########################################
# imlib check
temp_extralibs -lImlib2
if (imlib2-config --version) >/dev/null 2>&1 ; then
temp_cflags `imlib2-config --cflags`
temp_extralibs `imlib2-config --libs`
check_ld <<EOF && imlib2=yes || imlib2=no
#include <X11/Xlib.h>
#include <Imlib2.h>
int main( void ) { return (int) imlib_load_font("foo"); }
EOF
restore_flags
fi
##########################################
# FreeType check

3
vhook/Makefile
View File

@ -11,7 +11,8 @@ ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)
ifeq ($(HAVE_IMLIB2),yes)
HOOKS += imlib2$(SLIBSUF)
LIBS_imlib2$(SLIBSUF) = -lImlib2
CFLAGS += `imlib2-config --cflags`
LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
endif
ifeq ($(HAVE_FREETYPE2),yes)

1
vhook/imlib2.c
View File

@ -103,7 +103,6 @@
#undef time
#include <sys/time.h>
#include <time.h>
#include <X11/Xlib.h>
#include <Imlib2.h>
#include "eval.h"