From 83b5cde41ddb8fd20de4536dd68eb08da42d013e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Jul 2022 20:32:17 +0100 Subject: gentoo auto-resync : 17:07:2022 - 20:32:17 --- .../files/raptor-2.0.15-use-pkg-config-icu.patch | 48 ++++++++++ .../raptor-2.0.15-use-pkg-config-libxml2.patch | 41 +++++++++ .../raptor-2.0.15-use-pkg-config-libxslt.patch | 102 +++++++++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch create mode 100644 media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch create mode 100644 media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch (limited to 'media-libs/raptor/files') diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch new file mode 100644 index 000000000000..60fffcd804ee --- /dev/null +++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-icu.patch @@ -0,0 +1,48 @@ +https://github.com/dajobe/raptor/commit/3af116d61babd7042b42018c67a63baebf486df7 + +Fixes build with e.g. lld. + +From 3af116d61babd7042b42018c67a63baebf486df7 Mon Sep 17 00:00:00 2001 +From: Hugh McMaster +Date: Fri, 21 Aug 2020 20:48:17 +1000 +Subject: [PATCH] configure.ac: Use PKG_CHECK_MODULES to detect the ICU library + +--- a/configure.ac ++++ b/configure.ac +@@ -621,21 +621,10 @@ else + AC_MSG_RESULT(yes - $LIBCURL_VERSION) + fi + +- +-AC_ARG_WITH(icu-config, [ --with-icu-config=PATH Location of ICU icu-config []], icu_config="$withval", icu_config="") +- +-have_icu=no +-AC_MSG_CHECKING(for ICU) +-if test "X$icu_config" != "Xno" -a "X$icu_config" != "X" ; then +- ICU_CONFIG=$icu_config +- ICU_VERSION=`$ICU_CONFIG --version` ++PKG_CHECK_MODULES([ICU], [icu-uc], [ + have_icu=yes +- AC_MSG_RESULT(yes - version $ICU_VERSION) +-else +- AC_MSG_RESULT(no) +-fi +-dnl Note there is NO automated searching for icu-config +- ++ ICU_VERSION=`$PKG_CONFIG icu-uc --modversion` ++], [have_icu=no]) + + AC_ARG_WITH(www-config, [ --with-libwww-config=PATH Location of W3C libwww libwww-config []], libwww_config="$withval", libwww_config="") + +@@ -1183,8 +1172,8 @@ dnl ICU for NFC check + AC_MSG_CHECKING(NFC library to use) + nfc_library=none + if test $need_icu = yes; then +- CPPFLAGS="$CPPFLAGS `$ICU_CONFIG --cppflags-searchpath`" +- RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$ICU_CONFIG --ldflags-searchpath` -licuuc" ++ CPPFLAGS="$CPPFLAGS $ICU_CFLAGS" ++ RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $ICU_LIBS" + AC_LIBOBJ(raptor_nfc_icu) + nfc_library="ICU $ICU_VERSION" + fi + diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch new file mode 100644 index 000000000000..e53111b857fa --- /dev/null +++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxml2.patch @@ -0,0 +1,41 @@ +https://github.com/dajobe/raptor/commit/3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d + +From 3f9335b3cfd945a8d5f6f75f87cab04c53cc2b6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 27 Oct 2015 10:35:35 +0100 +Subject: [PATCH] configure.ac: do additional checks on libxml2 when library is + found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In yocto cross environments we must use pkg-config. Configuring with + + --without-xml2-config + --without-curl-config + +causes + +| checking for LIBXML... yes +| checking for libxml via pkg-config... yes - 2.9.2 +| checking for LIBCURL... yes +| checking for libcurl via pkg-config... yes - 7.44.0 +| checking for ICU... no +| checking for yajl installation... not found. Get it from http://lloyd.github.com/yajl/ and use --with-yajl=DIR if necessary to configure the installation directory. +| checking GRDDL parser requirements... no - libxml2 and libxslt are both not available + +Applying this patch fixes configuration. + +Signed-off-by: Andreas Müller +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ have_libxml=0 + need_libxml=0 + + oCPPFLAGS="$CPPFLAGS" +-if test "X$XML_CONFIG" != X; then ++if test "X$libxml_source" != X; then + CPPFLAGS="$LIBXML_CFLAGS $CPPFLAGS" + LIBS="$LIBS $LIBXML_LIBS" + AC_CHECK_FUNC(xmlCreatePushParserCtxt, have_xmlCreatePushParserCtxt=yes, have_xmlCreatePushParserCtxt=no) + diff --git a/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch new file mode 100644 index 000000000000..5ef9ac1b6ffa --- /dev/null +++ b/media-libs/raptor/files/raptor-2.0.15-use-pkg-config-libxslt.patch @@ -0,0 +1,102 @@ +Rebased version of https://github.com/dajobe/raptor/commit/abfdfb44cc00dfafbad4e594618621fce21590e1 + +--- a/configure.ac ++++ b/configure.ac +@@ -524,6 +524,44 @@ if test "X$xslt_config" != "Xno" ; then + fi + fi + ++if test "X$XSLT_CONFIG" != "X"; then ++ XSLT_CFLAGS=`$XSLT_CONFIG --cflags` ++ XSLT_LIBS=`$XSLT_CONFIG --libs` ++ ++ CPPFLAGS="$XSLT_CFLAGS $CPPFLAGS" ++ LIBS="$LIBS $XSLT_LIBS" ++ ++ AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) ++ AC_MSG_CHECKING(for libxslt via xslt-config) ++ if test $have_xsltSaveResultToString = yes; then ++ have_libxslt=1 ++ LIBXSLT_VERSION=`$XSLT_CONFIG --version` ++ libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` ++ libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + 3)};'` ++ AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) ++ if test $libxslt_version_dec -lt $libxslt_min_version_dec; then ++ AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) ++ have_libxslt=0 ++ fi ++ fi ++ ++ AC_CHECK_FUNC(xsltInit) ++ ++ AC_CHECK_HEADERS(libxslt/xslt.h) ++ if test "$ac_cv_header_libxslt_xslt_h" = no ; then ++ AC_MSG_WARN(libxslt library found but not headers - disabling) ++ have_libxslt_lib=0 ++ have_libxslt=0 ++ fi ++ CPPFLAGS="$oCPPFLAGS" ++ LIBS="$oLIBS" ++else ++ PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [ ++ LIBXSLT_VERSION=`$PKG_CONFIG libxslt --modversion` ++ have_libxslt=1 ++ ], [have_libxslt=0]) ++fi ++ + libcurl_source=no + PKG_CHECK_MODULES([LIBCURL],[libcurl],[ + LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +@@ -650,41 +688,6 @@ fi + CPPFLAGS="$oCPPFLAGS" + LIBS="$oLIBS" + +- +-have_libxslt=0 +- +-if test "X$XSLT_CONFIG" != X; then +- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" +- LIBS="$LIBS `$XSLT_CONFIG --libs`" +- AC_CHECK_FUNC(xsltSaveResultToString, have_xsltSaveResultToString=yes, have_xsltSaveResultToString=no) +- AC_MSG_CHECKING(for system libxslt library) +- if test $have_xsltSaveResultToString = yes; then +- have_libxslt=1 +- LIBXSLT_VERSION=`$XSLT_CONFIG --version` +- libxslt_version_dec=`echo $LIBXSLT_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- libxslt_min_version_dec=`echo $libxslt_min_version | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'` +- AC_MSG_RESULT(yes - version $LIBXSLT_VERSION) +- if test $libxslt_version_dec -lt $libxslt_min_version_dec; then +- AC_MSG_WARN(Using libxslt $LIBXSLT_VERSION is unsupported - $libxslt_min_version or newer required.) +- have_libxslt=0 +- fi +- else +- AC_MSG_RESULT(no) +- fi +- +- AC_CHECK_FUNC(xsltInit) +- +- AC_CHECK_HEADERS(libxslt/xslt.h) +- if test "$ac_cv_header_libxslt_xslt_h" = no ; then +- AC_MSG_WARN(libxslt library found but not headers - disabling) +- have_libxslt_lib=0 +- have_libxslt=0 +- fi +-fi +-CPPFLAGS="$oCPPFLAGS" +-LIBS="$oLIBS" +- +- + dnl Check for JSON library + + AC_ARG_WITH(yajl, [ --with-yajl=DIR YAJL installation directory or 'no' to disable (default=auto)], yajl_prefix="$withval", yajl_prefix="none") +@@ -1184,8 +1187,8 @@ AM_CONDITIONAL(RAPTOR_XML_LIBXML, test $need_libxml = 1) + + + if test $need_libxslt = 1; then +- RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS `$XSLT_CONFIG --libs`" +- CPPFLAGS="`$XSLT_CONFIG --cflags` $CPPFLAGS" ++ RAPTOR_LDFLAGS="$RAPTOR_LDFLAGS $XSLT_LIBS" ++ CPPFLAGS="$CPPFLAGS $XSLT_CFLAGS" + fi + + if test $need_libyajl = 1; then -- cgit v1.2.3