Skip to content

Commit 05d5984

Browse files
authored
Merge pull request #22905 from mhei/libiio-update-to-0.25
libiio: update to 0.25
2 parents 35b757e + 3893763 commit 05d5984

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

libs/libiio/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=libiio
11-
PKG_VERSION:=0.21
12-
PKG_RELEASE:=4
11+
PKG_VERSION:=0.25
12+
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://codeload.github.com/analogdevicesinc/libiio/tar.gz/v$(PKG_VERSION)?
16-
PKG_HASH:=03d13165cbeb83b036743cbd9a10e336c728da162714f39d13250a3d94305cac
16+
PKG_HASH:=21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c
1717

1818
PKG_LICENSE:=LGPL-2.1
1919
PKG_LICENSE_FILES:=COPYING.txt
@@ -35,7 +35,7 @@ include $(INCLUDE_DIR)/cmake.mk
3535

3636
CMAKE_OPTIONS += -DWITH_DOC=OFF
3737
CMAKE_OPTIONS += -DENABLE_IPV6=$(if $(CONFIG_IPV6),ON,OFF)
38-
CMAKE_OPTIONS += -DENABLE_AIO=OFF
38+
CMAKE_OPTIONS += -DWITH_AIO=OFF
3939
CMAKE_OPTIONS += -DWITH_LOCAL_BACKEND=$(if $(CONFIG_LIBIIO_LOCAL_BACKEND),ON,OFF)
4040
CMAKE_OPTIONS += -DWITH_LOCAL_CONFIG=OFF
4141
CMAKE_OPTIONS += -DWITH_NETWORK_BACKEND=$(if $(CONFIG_LIBIIO_NETWORK_BACKEND),ON,OFF)
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From bb688d04294dda45e68dfaf13e3bc1187841e52a Mon Sep 17 00:00:00 2001
2+
From: Jan Tojnar <[email protected]>
3+
Date: Sun, 10 Dec 2023 21:52:05 +0100
4+
Subject: [PATCH] xml: Fix compatibility with libxml 2.12
5+
6+
libxml 2.12.0 reorganized includes, resulting in the following no longer being in scope:
7+
8+
- XML_PARSE_DTDVALID
9+
- xmlReadMemory
10+
- xmlReadFile
11+
- xmlCleanupParser
12+
13+
Signed-off-by: Jan Tojnar <[email protected]>
14+
---
15+
xml.c | 1 +
16+
1 file changed, 1 insertion(+)
17+
18+
--- a/xml.c
19+
+++ b/xml.c
20+
@@ -10,6 +10,7 @@
21+
#include "iio-private.h"
22+
23+
#include <errno.h>
24+
+#include <libxml/parser.h>
25+
#include <libxml/tree.h>
26+
#include <string.h>
27+

0 commit comments

Comments
 (0)