Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
b8fd5718
Commit
b8fd5718
authored
Jul 04, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: fix and clean up fontconfig
parent
44b51330
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
17 deletions
+30
-17
contrib/src/fontconfig/rules.mak
contrib/src/fontconfig/rules.mak
+30
-17
No files found.
contrib/src/fontconfig/rules.mak
View file @
b8fd5718
...
...
@@ -4,6 +4,9 @@ FONTCONFIG_VERSION := 2.8.0
FONTCONFIG_URL
:=
http://fontconfig.org/release/fontconfig-
$(FONTCONFIG_VERSION)
.tar.gz
PKGS
+=
fontconfig
ifeq
($(call need_pkg,"fontconfig"),)
PKGS_FOUND
+=
fontconfig
endif
$(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.gz
:
$(
call
download,
$(FONTCONFIG_URL)
)
...
...
@@ -19,23 +22,30 @@ ifdef HAVE_WIN32
endif
$(MOVE)
FONTCONFIG_BASE_CONF
=
--prefix
=
$(PREFIX)
\
--with-freetype-config
=
$(PREFIX)
/bin/freetype-config
\
--enable-libxml2
\
--disable-docs
FONTCONFIG_CONF
:=
$(HOSTCONF)
\
--enable-libxml2
\
--disable-docs
FONTCONFIG_ENV
:=
$(HOSTVARS)
# FreeType flags
ifneq
($(findstring freetype2,$(PKGS)),)
FONTCONFIG_CONF
+=
--with-freetype-config
=
"
$(PREFIX)
/bin/freetype-config"
endif
FONTCONFIG_CONF-$(ENABLED)
=
$(HOSTCONF)
$(FONTCONFIG_BASE_CONF)
FONTCONFIG_CONF-$(HAVE_WIN32)
=
$(HOSTCONF)
--with-freetype-config
=
$(PREFIX)
/bin/freetype-config
--disable-docs
--with-arch
=
i686
FONTCONFIG_CONF-$(HAVE_MACOSX)
+=
$(HOSTCONF)
\
ifdef
HAVE_CROSS_COMPILE
FONTCONFIG_CONF
+=
--with-arch
=
$(ARCH)
endif
ifdef
HAVE_MACOSX
FONTCONFIG_CONF
+=
\
--with-cache-dir
=
~/Library/Caches/fontconfig
\
--with-confdir
=
/usr/X11/lib/X11/fonts
\
--with-default-fonts
=
/System/Library/Fonts
\
--with-add-fonts
=
/Library/Fonts,~/Library/Fonts
\
--with-arch
=
$(ARCH)
FONTCONFIG_ENV-$(ENABLED)
=
$(HOSTCC)
LIBXML2_CFLAGS
=
`
$(PREFIX)
/bin/xml2-config
--cflags
`
FONTCONFIG_ENV-$(HAVE_MACOSX)
=
$(HOSTCC)
LIBXML2_CFLAGS
=
`
xml2-config
--cflags
`
LIBXML2_LIBS
=
`
xml2-config
--libs
`
FONTCONFIG_ENV-$(HAVE_WIN32)
=
$(HOSTCC)
--with-add-fonts
=
/Library/Fonts,~/Library/Fonts
# libxml2 without pkg-config...
FONTCONFIG_ENV
+=
LIBXML2_CFLAGS
=
`
xml2-config
--cflags
`
FONTCONFIG_ENV
+=
LIBXML2_LIBS
=
`
xml2-config
--libs
`
endif
DEPS_fontconfig
=
freetype2
$(DEPS_freetype2)
libxml2
$(DEPS_libxml2)
...
...
@@ -43,11 +53,14 @@ DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
ifdef
HAVE_WIN32
$(RECONF)
endif
cd
$<
;
$
(
FONTCONFIG_ENV-1
)
./configure
$
(
FONTCONFIG_CONF-1
)
&&
make
cd
$<
&&
$(FONTCONFIG_ENV)
./configure
$(FONTCONFIG_CONF)
cd
$<
&&
$(MAKE)
ifndef
HAVE_MACOSX
cd
$<
;
make
install
cd
$<
&&
$(MAKE)
install
else
cd
$<
;
make install-exec
&&
(
cd
fontconfig
;
make install-data
)
&&
cp
fontconfig.pc
$(PKG_CONFIG_LIBDIR)
&&
sed
-e
's%/usr/lib/libiconv.la%%'
-i
.orig
$(PREFIX)
/lib/libfontconfig.la
cd
$<
&&
$(MAKE)
install-exec
cd
$<
/fontconfig
&&
$(MAKE)
install-data
sed
-e
's%/usr/lib/libiconv.la%%'
-i
.orig
$(PREFIX)
/lib/libfontconfig.la
cp
$<
/fontconfig.pc
$(PREFIX)
/lib/pkgconfig
endif
$(INSTALL_NAME)
touch
$@
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment