SDL2_ttf: update to 2.20.2. Force usage of freetype2 and harfbuzz from pkgsrc, instead of using included copies Changes: This is a stable bugfix release, with the following changes: Fixed building from source without running autogen.shdiff -r1.22 -r1.23 pkgsrc/fonts/SDL2_ttf/Makefile
(wiz)
@@ -1,26 +1,30 @@ | @@ -1,26 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.22 2023/01/29 21:14:34 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.23 2023/02/14 16:04:12 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= SDL2_ttf-2.20.1 | 3 | DISTNAME= SDL2_ttf-2.20.2 | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= fonts devel | 4 | CATEGORIES= fonts devel | |
6 | MASTER_SITES= https://www.libsdl.org/projects/SDL_ttf/release/ | 5 | MASTER_SITES= https://www.libsdl.org/projects/SDL_ttf/release/ | |
7 | 6 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= https://www.libsdl.org/projects/SDL_ttf/ | 8 | HOMEPAGE= https://www.libsdl.org/projects/SDL_ttf/ | |
10 | COMMENT= Use TrueType fonts in your SDL2 applications | 9 | COMMENT= Use TrueType fonts in your SDL2 applications | |
11 | LICENSE= zlib | 10 | LICENSE= zlib | |
12 | 11 | |||
13 | USE_LANGUAGES= c c++11 | 12 | USE_LANGUAGES= c c++11 | |
14 | USE_LIBTOOL= yes | 13 | USE_LIBTOOL= yes | |
15 | USE_TOOLS+= pkg-config | 14 | USE_TOOLS+= pkg-config | |
16 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
17 | 16 | |||
18 | PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in | 17 | PKGCONFIG_OVERRIDE+= SDL2_ttf.pc.in | |
19 | 18 | |||
19 | CONFIGURE_ARGS+= --enable-harfbuzz | |||
20 | CONFIGURE_ARGS+= --disable-harfbuzz-builtin | |||
21 | CONFIGURE_ARGS+= --disable-freetype-builtin | |||
22 | ||||
20 | CHECK_PORTABILITY_SKIP+= Xcode/iOS/build-scripts/iosbuild.sh | 23 | CHECK_PORTABILITY_SKIP+= Xcode/iOS/build-scripts/iosbuild.sh | |
21 | CHECK_PORTABILITY_SKIP+= Xcode/tvOS/build-scripts/tvosbuild.sh | 24 | CHECK_PORTABILITY_SKIP+= Xcode/tvOS/build-scripts/tvosbuild.sh | |
22 | 25 | |||
23 | .include "../../devel/SDL2/buildlink3.mk" | 26 | .include "../../devel/SDL2/buildlink3.mk" | |
24 | .include "../../devel/zlib/buildlink3.mk" | 27 | .include "../../devel/zlib/buildlink3.mk" | |
28 | .include "../../fonts/harfbuzz/buildlink3.mk" | |||
25 | .include "../../graphics/freetype2/buildlink3.mk" | 29 | .include "../../graphics/freetype2/buildlink3.mk" | |
26 | .include "../../mk/bsd.pkg.mk" | 30 | .include "../../mk/bsd.pkg.mk" |
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.13 2023/01/29 21:14:34 ryoon Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.14 2023/02/14 16:04:12 wiz Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= SDL2_ttf | 3 | BUILDLINK_TREE+= SDL2_ttf | |
4 | 4 | |||
5 | .if !defined(SDL2_TTF_BUILDLINK3_MK) | 5 | .if !defined(SDL2_TTF_BUILDLINK3_MK) | |
6 | SDL2_TTF_BUILDLINK3_MK:= | 6 | SDL2_TTF_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12 | 8 | BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12 | |
9 | BUILDLINK_ABI_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.20.1nb2 | 9 | BUILDLINK_ABI_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.20.2 | |
10 | BUILDLINK_PKGSRCDIR.SDL2_ttf?= ../../fonts/SDL2_ttf | 10 | BUILDLINK_PKGSRCDIR.SDL2_ttf?= ../../fonts/SDL2_ttf | |
11 | 11 | |||
12 | .include "../../devel/SDL2/buildlink3.mk" | 12 | .include "../../devel/SDL2/buildlink3.mk" | |
13 | .include "../../devel/zlib/buildlink3.mk" | 13 | .include "../../devel/zlib/buildlink3.mk" | |
14 | .include "../../fonts/harfbuzz/buildlink3.mk" | |||
14 | .include "../../graphics/freetype2/buildlink3.mk" | 15 | .include "../../graphics/freetype2/buildlink3.mk" | |
15 | .endif # SDL2_TTF_BUILDLINK3_MK | 16 | .endif # SDL2_TTF_BUILDLINK3_MK | |
16 | 17 | |||
17 | BUILDLINK_TREE+= -SDL2_ttf | 18 | BUILDLINK_TREE+= -SDL2_ttf |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2022/08/22 10:55:27 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.11 2023/02/14 16:04:12 wiz Exp $ | |
2 | 2 | |||
3 | BLAKE2s (SDL2_ttf-2.20.1.tar.gz) = 19aa399ac7c742e5427b766c673b3b452b4e96539d621b1507368cff57df9b7e | 3 | BLAKE2s (SDL2_ttf-2.20.2.tar.gz) = 08e96fb1f57262c4d24b47f17cc59265189c6286bef91b3596f748d445335dce | |
4 | SHA512 (SDL2_ttf-2.20.1.tar.gz) = 5745a318583a771dff30421d79c5940bdb0fe2f8908a0192e98a2a80076722ba53f6488e922de5b49e078f0c7d9d358e681886ebc8862d89ca6671b5be471134 | 4 | SHA512 (SDL2_ttf-2.20.2.tar.gz) = b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c | |
5 | Size (SDL2_ttf-2.20.1.tar.gz) = 13160460 bytes | 5 | Size (SDL2_ttf-2.20.2.tar.gz) = 13161592 bytes |