[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: libxml2: update to 2.11.4

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
6c0b2d57 by Johannes Kauffmann at 2023-08-07T16:34:25+00:00
contrib: libxml2: update to 2.11.4

- - - - -
1ff1f35f by Johannes Kauffmann at 2023-08-07T16:34:25+00:00
contrib: libxml2: remove DOCB option

Since libxml2 2.10.0, this option has been removed.

- - - - -
730fbfdd by Johannes Kauffmann at 2023-08-07T16:34:25+00:00
contrib: libxml2: remove extra added CFLAGS

It is not used since 5356a445abc64d846c6c618b32a980c4fc1612a0.

- - - - -
579a6ce3 by Johannes Kauffmann at 2023-08-07T16:34:25+00:00
contrib: libxml2: remove patch for .pc file

The uninitialized variable is ${pcfiledir}, which is actually a special
variable supported by pkg-config, and is meant to make the .pc files
relocatable (1). While this variable is (mostly) meant for Windows,
where no true system-wide installation exists (2), it also works fine
under Linux. So don't patch it away.

1. https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/d97db4fae4c1cd099b506970b285dc2afd818ea2/pkg-config.1#L400
2. https://bugs.freedesktop.org/show_bug.cgi?id=62018

- - - - -


2 changed files:

- contrib/src/libxml2/SHA512SUMS
- contrib/src/libxml2/rules.mak


Changes:

=====================================
contrib/src/libxml2/SHA512SUMS
=====================================
@@ -1 +1 @@
-d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606  libxml2-2.9.14.tar.xz
+c1df7441c729430bdd2de52e9da69b171afc4b776e4a2eb43acbc71ada7a3814a465247fb5fca4c83ecf1c281f7745069ec3d051a7964cb7cc119a3d983f93ba  libxml2-2.11.4.tar.xz


=====================================
contrib/src/libxml2/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # libxml2
 
-LIBXML2_VERSION := 2.9.14
-LIBXML2_URL := https://download.gnome.org/sources/libxml2/2.9/libxml2-$(LIBXML2_VERSION).tar.xz
+LIBXML2_VERSION := 2.11.4
+LIBXML2_URL := https://download.gnome.org/sources/libxml2/2.11/libxml2-$(LIBXML2_VERSION).tar.xz
 
 PKGS += libxml2
 ifeq ($(call need_pkg,"libxml-2.0"),)
@@ -29,7 +29,6 @@ LIBXML2_CONF = \
         -DLIBXML2_WITH_ICONV=OFF   \
         -DLIBXML2_WITH_HTTP=OFF    \
         -DLIBXML2_WITH_FTP=OFF     \
-        -DLIBXML2_WITH_DOCB=OFF    \
         -DLIBXML2_WITH_REGEXPS=OFF \
         -DLIBXML2_WITH_PYTHON=OFF \
         -DLIBXML2_WITH_LZMA=OFF \
@@ -40,12 +39,8 @@ ifdef WITH_OPTIMIZATION
 LIBXML2_CONF += -DLIBXML2_WITH_DEBUG=OFF
 endif
 
-XMLCONF += CFLAGS="$(CFLAGS) -DLIBXML_STATIC"
-
 libxml2: libxml2-$(LIBXML2_VERSION).tar.xz .sum-libxml2
 	$(UNPACK)
-	# fix pkg-config file using an unset variable
-	sed -e 's,"\\\$${pcfiledir}/$${PACKAGE_RELATIVE_PATH}","$${CMAKE_INSTALL_PREFIX}",' -i.orig  "$(UNPACK_DIR)/CMakeLists.txt"
 	$(call pkg_static,"libxml-2.0.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/16eb51a237222dbcb5ca82b78804a629be30753f...579a6ce3596f1c3458e25280546e55ffaa9847ba

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/16eb51a237222dbcb5ca82b78804a629be30753f...579a6ce3596f1c3458e25280546e55ffaa9847ba
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance