Attachment #214958 for bug #246803

View | Details | Raw Unified | Return to bug 246803
Collapse All | Expand All

Lines 2-10 Link Here

(-)graphics/sane-backends/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sane-backends	4	PORTNAME= sane-backends
5	PORTVERSION= 1.0.29	5	PORTVERSION= 1.0.30
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/	7	MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
8		8
9	MAINTAINER= tobik@FreeBSD.org	9	MAINTAINER= tobik@FreeBSD.org
10	COMMENT= API for access to scanners, digitals camera, frame grabbers etc	10	COMMENT= API for access to scanners, digitals camera, frame grabbers etc

Lines 1-3 Link Here

(-)graphics/sane-backends/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580719476	1	TIMESTAMP = 1590320202
2	SHA256 (sane-backends-1.0.29.tar.gz) = aa027b4e5f59849cd41b8c26d54584cf31fffd986049019be6ad4140e11ea8ed	2	SHA256 (sane-backends-1.0.30.tar.gz) = 3f5d96a9c47f6124a46bb577c776bbc4896dd17b9203d8bfbc7fe8cbbcf279a3
3	SIZE (sane-backends-1.0.29.tar.gz) = 7201950	3	SIZE (sane-backends-1.0.30.tar.gz) = 7204519




--- backend/Makefile.in.orig	2020-05-24 12:29:38 UTC
+++ backend/Makefile.in
@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)

 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
 libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
 
 # WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
+libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -7174,7 +7174,7 @@ install-becfg: becfg
 	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
 	@# Having two libsane's can cause issues so get rid of it.

Return to bug 246803

Lines 1-4 Link Here

(-)graphics/sane-backends/files/patch-backend_Makefile.in (-10 / +1 lines)
1	--- backend/Makefile.in.orig 2020-02-03 08:54:00 UTC	1	--- backend/Makefile.in.orig 2020-05-24 12:29:38 UTC
2	+++ backend/Makefile.in	2	+++ backend/Makefile.in
3	@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_@AM_V@)	3	@@ -1645,7 +1645,7 @@ AM_V_at = $(am__v_at_@AM_V@)
4	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)	4	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
Lines 9-23 Link Here
9	depcomp = $(SHELL) $(top_srcdir)/depcomp	9	depcomp = $(SHELL) $(top_srcdir)/depcomp
10	am__maybe_remake_depfiles = depfiles	10	am__maybe_remake_depfiles = depfiles
11	am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \	11	am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \
12	@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
13	libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
14
15	# WARNING: Automake is getting this wrong so have to do it ourselves.
16	-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
17	+libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
18	all: $(BUILT_SOURCES)
19	$(MAKE) $(AM_MAKEFLAGS) all-am
20
21	@@ -7174,7 +7174,7 @@ install-becfg: becfg	12	@@ -7174,7 +7174,7 @@ install-becfg: becfg
22	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.	13	@# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*.
23	@# Having two libsane's can cause issues so get rid of it.	14	@# Having two libsane's can cause issues so get rid of it.