Skip to content

Commit 21908b7

Browse files
committed
build-libdvdnav: switch to meson
1 parent c17273f commit 21908b7

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

build-libdvdnav

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,31 @@ set -a; . .env; set +a
99
pkgname="libdvdnav"
1010
pkgdir="${STOWDIR}/${pkgname}"
1111
srcdir="src/libdvdnav"
12+
builddir="${TMPDIR:-/tmp}/build.${pkgname}"
1213

1314
echo
1415
echo "*** $0: started"
1516

16-
cd "${srcdir}"
17+
rm -rf "${builddir}"
1718

18-
./configure \
19+
meson setup "${builddir}" "${srcdir}" \
1920
--prefix="${pkgdir}" \
20-
--enable-shared \
21-
--disable-static \
22-
--disable-apidoc \
21+
-Ddefault_library=shared \
22+
-Dwrap_mode=nodownload \
23+
-Dbuildtype=release \
24+
-Db_lto=true \
25+
-Db_lto_mode=thin \
26+
-Denable_docs=false \
27+
-Denable_examples=false \
2328
"$@"
2429

25-
make -j4
30+
meson compile -C "${builddir}"
2631

2732
rm -rf "${pkgdir}"
2833

29-
make install
30-
rm -rf "${pkgdir}"/lib/*.la "${pkgdir}"/share
34+
meson install -C "${builddir}" --tags runtime,devel
3135
stow -Rd "${STOWDIR}" "${pkgname}"
3236

37+
rm -rf "${builddir}"
38+
3339
echo "*** $0: finished"

build-libdvdread

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ meson setup "${builddir}" "${srcdir}" \
2323
-Dbuildtype=release \
2424
-Db_lto=true \
2525
-Db_lto_mode=thin \
26+
-Denable_docs=false \
27+
-Dlibdvdcss=disabled \
2628
"$@"
2729

2830
meson compile -C "${builddir}"

fetch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,8 @@ fetch_libbluray() {
8282
}
8383

8484
fetch_libdvdnav() {
85-
local version="6.1.1"
86-
local url="https://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"
87-
fetch_tar "${url}" libdvdnav
85+
local url="https://code.videolan.org/videolan/libdvdnav.git"
86+
git -C src clone --depth 1 "${url}"
8887
}
8988

9089
fetch_libdvdread() {

0 commit comments

Comments
 (0)