dvdauthor: fix cross build
The detection of freetyp2 through freetype-config did not work for cross builds. Patch to use pkg-config instead.
This commit is contained in:
parent
0c63b22177
commit
5079d9399a
2 changed files with 35 additions and 2 deletions
27
srcpkgs/dvdauthor/patches/freetype-pkg_config.patch
Normal file
27
srcpkgs/dvdauthor/patches/freetype-pkg_config.patch
Normal file
|
@ -0,0 +1,27 @@
|
|||
--- configure.ac 2016-12-31 00:25:38.000000000 +0100
|
||||
+++ configure.ac 2020-09-20 00:16:14.950903683 +0200
|
||||
@@ -84,10 +84,8 @@
|
||||
AC_SUBST(FRIBIDI_CFLAGS)
|
||||
AC_SUBST(FRIBIDI_LIBS)
|
||||
|
||||
-AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
|
||||
-if test -n "$FREETYPECONFIG"; then
|
||||
- FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
|
||||
- FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
|
||||
+PKG_CHECK_MODULES(FREETYPE, [freetype2],[
|
||||
+ FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"
|
||||
AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
|
||||
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
@@ -96,9 +94,9 @@
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
AC_SUBST(FREETYPE_CPPFLAGS)
|
||||
AC_SUBST(FREETYPE_LIBS)
|
||||
-else
|
||||
+ ],
|
||||
AC_MSG_ERROR([freetype not found])
|
||||
-fi
|
||||
+)
|
||||
|
||||
|
||||
AC_ARG_ENABLE([default-video-format],
|
|
@ -4,8 +4,10 @@ version=0.7.2
|
|||
revision=4
|
||||
wrksrc="${pkgname}"
|
||||
build_style=gnu-configure
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="libpng-devel freetype-devel fribidi-devel libxml2-devel libdvdnav-devel"
|
||||
hostmakedepends="automake libtool gettext gettext-devel
|
||||
libxml2-devel pkg-config"
|
||||
makedepends="gettext-devel libpng-devel freetype-devel fribidi-devel
|
||||
libxml2-devel libdvdnav-devel"
|
||||
short_desc="DVD authoring tools, generate a DVD movie from MPEG2 stream"
|
||||
maintainer="Dan Kociela <dkociela@gmail.com>"
|
||||
license="GPL-2.0-or-later"
|
||||
|
@ -22,3 +24,7 @@ vopt_conflict NTSC PAL
|
|||
configure_args="--enable-localize-filenames \
|
||||
$(vopt_if NTSC '--enable-default-video-format=NTSC' "" ) \
|
||||
$(vopt_if PAL '--enable-default-video-format=PAL' "")"
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 autoreconf -fi
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue