commit:     67644f9a2e62405832926dfb03407c49b6771392
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 30 21:03:02 2025 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Sep 30 21:03:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67644f9a

media-gfx/sane-airscan: add 0.99.36

Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 media-gfx/sane-airscan/Manifest                    |  1 +
 .../sane-airscan-0.99.36-makefile-fixes.patch      | 56 ++++++++++++++++++++++
 media-gfx/sane-airscan/sane-airscan-0.99.36.ebuild | 43 +++++++++++++++++
 3 files changed, 100 insertions(+)

diff --git a/media-gfx/sane-airscan/Manifest b/media-gfx/sane-airscan/Manifest
index 7ab733ee18c9..9bd439a5143b 100644
--- a/media-gfx/sane-airscan/Manifest
+++ b/media-gfx/sane-airscan/Manifest
@@ -1,2 +1,3 @@
 DIST sane-airscan-0.99.27.tar.gz 198418 BLAKE2B 
bcf2aff08feb90a65c10a4abaca67939874ad7c9376745b572f18ebfdaf7bff3e344d1379b00c73904a6892731a75f4632a90ea7c20f7cb4e30eab43413b829d
 SHA512 
a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256
 DIST sane-airscan-0.99.29.tar.gz 211753 BLAKE2B 
35f0df4d5df57d2651e6d0195046e703a5f4a49b8d50345d749b570892b0c865cf7b1ed7313fba27ce9586cededffd5d85ce211ca767b50f59fe752c2f869d4c
 SHA512 
a75a3db66aa1c77508a946dc7647f322d0be9c8defc6b4b6fdf1015f5a81ea02209efb7aa2c5284813e257bc2b8727a430804385368c8c7b97df24d61adda483
+DIST sane-airscan-0.99.36.tar.gz 218775 BLAKE2B 
87e75ae1924fd06d50e05a77159baf92ee6fa8d24cf2d9af4499130008b89c6b27e3a899e8dd19311f4de2381e9c1e78c780bed23f0d238195f781367ed04c59
 SHA512 
a87f9ede123710b4be9d0bbf950487abf71ddc9691020d2defadf99eae12afc78b4d99df834c4f84984bc2cae4e3190fa4dac7a44518a3445f263aa4ad37ea67

diff --git 
a/media-gfx/sane-airscan/files/sane-airscan-0.99.36-makefile-fixes.patch 
b/media-gfx/sane-airscan/files/sane-airscan-0.99.36-makefile-fixes.patch
new file mode 100644
index 000000000000..c3ba563539a6
--- /dev/null
+++ b/media-gfx/sane-airscan/files/sane-airscan-0.99.36-makefile-fixes.patch
@@ -0,0 +1,56 @@
+From c43707516a42e3ca4c469b338c3e58a0f3def473 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <[email protected]>
+Date: Tue, 30 Sep 2025 23:00:34 +0200
+Subject: [PATCH] Makefile: abstract ar to $(AR) and remove tags from all
+
+Build systems need to be able to use a custom `ar` binary. Also, running
+ctags is generally not desirable for the default target.
+
+Signed-off-by: Jason A. Donenfeld <[email protected]>
+---
+Sent upstream as: https://github.com/alexpevzner/sane-airscan/pull/197
+
+ Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d34c335..6380730 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,6 +7,7 @@
+ #   ----     -------                    -----------
+ #   DESTDIR                             Destination directory for make install
+ #   CC         gcc                      C compiler
++#   AR         ar                       Archiver
+ #   CPPFLAGS                            C preprocessor flags
+ #   CFLAGS     -O2 -g -W -Wall -Werror  C compiler flags
+ #   LDFLAGS                             Linker flags
+@@ -28,6 +29,7 @@
+ #
+ 
+ CC            = gcc
++AR            = ar
+ COMPRESS      = gzip -n
+ CFLAGS                += -O2 -g -W -Wall -Werror -pthread $(CPPFLAGS)
+ PKG_CONFIG    = pkg-config
+@@ -101,7 +103,7 @@ $(OBJDIR)%.o: %.c Makefile airscan.h
+ 
+ .PHONY: all clean install man
+ 
+-all:  tags $(BACKEND) $(DISCOVER) test test-decode test-devcaps 
test-multipart test-zeroconf test-uri
++all:  $(BACKEND) $(DISCOVER) test test-decode test-devcaps test-multipart 
test-zeroconf test-uri
+ 
+ tags: $(SRC) airscan.h test.c test-decode.c test-devcaps.c test-multipart.c 
test-zeroconf.c test-uri.c
+       -ctags -R .
+@@ -113,7 +115,7 @@ $(DISCOVER): $(OBJDIR)discover.o $(LIBAIRSCAN)
+        $(CC) -o $(DISCOVER) discover.c $(CPPFLAGS) $(common_CFLAGS) 
$(LIBAIRSCAN) $(tools_LDFLAGS)
+ 
+ $(LIBAIRSCAN): $(OBJ) Makefile
+-      ar cru $(LIBAIRSCAN) $(OBJ)
++      $(AR) cru $(LIBAIRSCAN) $(OBJ)
+ 
+ install: all
+       mkdir -p $(DESTDIR)/$(bindir)
+-- 
+2.51.0
+

diff --git a/media-gfx/sane-airscan/sane-airscan-0.99.36.ebuild 
b/media-gfx/sane-airscan/sane-airscan-0.99.36.ebuild
new file mode 100644
index 000000000000..6f3bae71fd8a
--- /dev/null
+++ b/media-gfx/sane-airscan/sane-airscan-0.99.36.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SANE backend for AirScan (eSCL) and WSD document scanners"
+HOMEPAGE="https://github.com/alexpevzner/sane-airscan";
+SRC_URI="https://github.com/alexpevzner/${PN}/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+       dev-libs/libxml2:=
+       media-libs/libjpeg-turbo:=
+       media-libs/libpng:=
+       media-libs/tiff:=
+       net-dns/avahi
+       net-libs/gnutls:=
+"
+RDEPEND="${DEPEND}
+       media-gfx/sane-backends
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-0.99.36-makefile-fixes.patch"
+)
+
+src_compile() {
+       emake \
+               CFLAGS="${CFLAGS}" \
+               CPPFLAGS="${CPPFLAGS}" \
+               LDFLAGS="${LDFLAGS}" \
+               CC="$(tc-getCC)" \
+               AR="$(tc-getAR)"
+}
+
+src_install() {
+       emake DESTDIR="${D}" COMPRESS= STRIP= install
+}

Reply via email to