From f6ee669b8030d9f64e0bae572b2b38ee379c8608 Mon Sep 17 00:00:00 2001 From: ejurgensen Date: Wed, 29 May 2024 22:54:58 +0200 Subject: [PATCH] [docs] Change mxml to libxml2 --- docs/building.md | 10 ++++------ owntone.spec.in | 2 +- scripts/freebsd_install.sh | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/building.md b/docs/building.md index 2b0a1b1d..7e9f19bc 100644 --- a/docs/building.md +++ b/docs/building.md @@ -15,7 +15,7 @@ sudo apt-get install \ build-essential git autotools-dev autoconf automake libtool gettext gawk \ gperf bison flex libconfuse-dev libunistring-dev libsqlite3-dev \ libavcodec-dev libavformat-dev libavfilter-dev libswscale-dev libavutil-dev \ - libasound2-dev libmxml-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev \ + libasound2-dev libxml2-dev libgcrypt20-dev libavahi-client-dev zlib1g-dev \ libevent-dev libplist-dev libsodium-dev libjson-c-dev libwebsockets-dev \ libcurl4-openssl-dev libprotobuf-c-dev ``` @@ -73,7 +73,7 @@ will need ffmpeg. You can google how to do that. Then run: ```bash sudo dnf install \ git automake autoconf gettext-devel gperf gawk libtool bison flex \ - sqlite-devel libconfuse-devel libunistring-devel mxml-devel libevent-devel \ + sqlite-devel libconfuse-devel libunistring-devel libxml2-devel libevent-devel \ avahi-devel libgcrypt-devel zlib-devel alsa-lib-devel ffmpeg-devel \ libplist-devel libsodium-devel json-c-devel libwebsockets-devel \ libcurl-devel protobuf-c-devel @@ -137,11 +137,9 @@ Install MacPorts (which requires Xcode): sudo port install \ autoconf automake libtool pkgconfig git gperf bison flex libgcrypt \ libunistring libconfuse ffmpeg libevent json-c libwebsockets curl \ - libplist libsodium protobuf-c + libplist libsodium protobuf-c libxml2 ``` -Download, configure, build, and install the [Mini-XML library](https://www.msweet.org/mxml/) - Download, configure, build and install the [libinotify-kqueue library](https://github.com/libinotify-kqueue/libinotify-kqueue) Add the following to `.bashrc`: @@ -226,7 +224,7 @@ Libraries: - [FFmpeg](https://ffmpeg.org/) - [libconfuse](https://github.com/libconfuse/libconfuse) - [libevent](https://libevent.org/) 2.1.4+ -- [Mini-XML](https://www.msweet.org/mxml/) (aka mxml or libmxml) +- [libxml2](https://gitlab.gnome.org/GNOME/libxml2) - [Libgcrypt](https://gnupg.org/software/libgcrypt/) 1.2.0+ - [zlib](https://zlib.net/) - [libunistring](https://www.gnu.org/software/libunistring/) 0.9.3+ diff --git a/owntone.spec.in b/owntone.spec.in index 753add99..48644fb9 100644 --- a/owntone.spec.in +++ b/owntone.spec.in @@ -19,7 +19,7 @@ Url: https://github.com/owntone/owntone-server Source0: https://github.com/owntone/%{name}/archive/%{version}/%{name}-%{version}.tar.xz %{?systemd_ordering} BuildRequires: gcc, make, bison, flex, systemd, pkgconfig, libunistring-devel -BuildRequires: pkgconfig(zlib), pkgconfig(libconfuse), pkgconfig(mxml) +BuildRequires: pkgconfig(zlib), pkgconfig(libconfuse), pkgconfig(libxml2) BuildRequires: pkgconfig(sqlite3) >= 3.5.0, pkgconfig(libevent) >= 2.0.0 BuildRequires: pkgconfig(json-c), libgcrypt-devel >= 1.2.0 BuildRequires: libgpg-error-devel >= 1.6 diff --git a/scripts/freebsd_install.sh b/scripts/freebsd_install.sh index eb1aa330..478cfca1 100755 --- a/scripts/freebsd_install.sh +++ b/scripts/freebsd_install.sh @@ -20,7 +20,7 @@ if [ "$yn" != "y" ]; then fi DEPS="gmake autoconf automake libtool gettext gperf glib pkgconf wget git \ - ffmpeg libconfuse libevent mxml libgcrypt libunistring libiconv curl \ + ffmpeg libconfuse libevent libxml2 libgcrypt libunistring libiconv curl \ libplist libinotify avahi sqlite3 alsa-lib libsodium json-c libwebsockets protobuf-c bison flex" echo "The script can install the following dependency packages for you:"