Tue Jan 12 18:06:58 2021 UTC ()
babl: Don't require --version-script.


(jperkin)
diff -r1.37 -r1.38 pkgsrc/graphics/babl/Makefile
diff -r1.28 -r1.29 pkgsrc/graphics/babl/distinfo
diff -r0 -r1.4 pkgsrc/graphics/babl/patches/patch-babl_meson.build
cvs diff -r1.37 -r1.38 pkgsrc/graphics/babl/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/babl/Makefile 2020/10/08 11:16:29 1.37
+++ pkgsrc/graphics/babl/Makefile 2021/01/12 18:06:58 1.38
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.37 2020/10/08 11:16:29 ryoon Exp $ 1# $NetBSD: Makefile,v 1.38 2021/01/12 18:06:58 jperkin Exp $
2 2
3DISTNAME= babl-0.1.82 3DISTNAME= babl-0.1.82
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= https://download.gimp.org/pub/babl/0.1/ 5MASTER_SITES= https://download.gimp.org/pub/babl/0.1/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://gegl.org/babl/ 9HOMEPAGE= http://gegl.org/babl/
10COMMENT= Dynamic pixel conversion library 10COMMENT= Dynamic pixel conversion library
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15 15
16MESON_ARGS+= -Dwith-docs=false 16MESON_ARGS+= -Dwith-docs=false
17MESON_ARGS+= -Denable-gir=false 17MESON_ARGS+= -Denable-gir=false
18 18
19PKGCONFIG_OVERRIDE+= babl.pc.in 19PKGCONFIG_OVERRIDE+= babl.pc.in
20 20
21PYTHON_FOR_BUILD_ONLY= tool 21PYTHON_FOR_BUILD_ONLY= tool
22 22
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25PLIST_VARS+= Darwin not_Darwin 25PLIST_VARS+= Darwin not_Darwin
26.if ${OPSYS} == "Darwin" 26.if ${OPSYS} == "Darwin"
27PLIST.Darwin= yes 27PLIST.Darwin= yes
28PLIST_SUBST+= SOEXT="dylib" 28PLIST_SUBST+= SOEXT="dylib"
29.else 29.else
30PLIST.not_Darwin= yes 30PLIST.not_Darwin= yes
31PLIST_SUBST+= SOEXT="so" 31PLIST_SUBST+= SOEXT="so"
32.endif 32.endif
33 33
34# Apply removals to post-wrapper transformed arguments. 34# Apply removals to post-wrapper transformed arguments.
35BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--version-script 35BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--version-script
36BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,babl.map 36BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,babl.map
37BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script 37BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script
38BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,babl.map 38BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,babl.map
39 39
40.include "../../devel/meson/build.mk" 40.include "../../devel/meson/build.mk"
41.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
42.include "../../graphics/lcms2/buildlink3.mk" 42.include "../../graphics/lcms2/buildlink3.mk"
43.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
44.include "../../mk/dlopen.buildlink3.mk" 44.include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.28 -r1.29 pkgsrc/graphics/babl/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/babl/distinfo 2020/10/08 11:16:29 1.28
+++ pkgsrc/graphics/babl/distinfo 2021/01/12 18:06:58 1.29
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.28 2020/10/08 11:16:29 ryoon Exp $ 1$NetBSD: distinfo,v 1.29 2021/01/12 18:06:58 jperkin Exp $
2 2
3SHA1 (babl-0.1.82.tar.xz) = d446cde86c13905fbb47a44afee3f80935580893 3SHA1 (babl-0.1.82.tar.xz) = d446cde86c13905fbb47a44afee3f80935580893
4RMD160 (babl-0.1.82.tar.xz) = 4d1a990773217d2a2536c773f6621fa511dd5598 4RMD160 (babl-0.1.82.tar.xz) = 4d1a990773217d2a2536c773f6621fa511dd5598
5SHA512 (babl-0.1.82.tar.xz) = f6eabc53a8b9a2f6002ec75ec9175aa854e54a6d1c14e8723506d44f7fc3230dbfb19b4595d73d5922c705a97a000230aa6ed33f4dc0de0d9399dc939fe61c8c 5SHA512 (babl-0.1.82.tar.xz) = f6eabc53a8b9a2f6002ec75ec9175aa854e54a6d1c14e8723506d44f7fc3230dbfb19b4595d73d5922c705a97a000230aa6ed33f4dc0de0d9399dc939fe61c8c
6Size (babl-0.1.82.tar.xz) = 299348 bytes 6Size (babl-0.1.82.tar.xz) = 299348 bytes
 7SHA1 (patch-babl_meson.build) = ff2ab73080b97cf442e7581932d22a612f4e3093
7SHA1 (patch-extensions_gggl.c) = 4981d58c145a84a8b4f579127221e6289f13c036 8SHA1 (patch-extensions_gggl.c) = 4981d58c145a84a8b4f579127221e6289f13c036
File Added: pkgsrc/graphics/babl/patches/patch-babl_meson.build
$NetBSD: patch-babl_meson.build,v 1.4 2021/01/12 18:06:58 jperkin Exp $

Not having --version-script is not an error.

--- babl/meson.build.orig	2020-10-04 16:37:23.504518000 +0000
+++ babl/meson.build
@@ -46,9 +46,7 @@ elif cc.get_id() == 'clang'
     babl_link_args = []
   endif
 else
-  error(
-    'Linker doesn\'t support --version-script or -exported_symbols_list'
-  )
+  babl_link_args = []
 endif
 if platform_win32
   babl_link_args += no_undefined