aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2017-03-02 10:59:35 -0800
committerAric Belsito <lluixhi@gmail.com>2017-03-02 10:59:35 -0800
commit7946d9e32bc1864ac1a3eb77dec964a80a501d9a (patch)
tree05ed3482875074185028a387877606be217f367b
parentdev-libs/DirectFB: sync with upstream (diff)
downloadmusl-7946d9e32bc1864ac1a3eb77dec964a80a501d9a.tar.gz
musl-7946d9e32bc1864ac1a3eb77dec964a80a501d9a.tar.bz2
musl-7946d9e32bc1864ac1a3eb77dec964a80a501d9a.zip
media-gfx/sane-backends: sync with upstream
drop r99 suffix
-rw-r--r--media-gfx/sane-backends/Manifest5
-rw-r--r--media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch30
-rw-r--r--media-gfx/sane-backends/metadata.xml1
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild (renamed from media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild)4
4 files changed, 36 insertions, 4 deletions
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 1577db75..cf873419 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -1,5 +1,6 @@
AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b
AUX sane-backends-1.0.24-automagic_systemd.patch 1310 SHA256 5461cb3aa8bad1b299cd92c525cf6af5a3af5a82e81a74549a7f660d026ee610 SHA512 1edf28a2d106cf05df92a55ef3bf4ea530c9ee69a2517f14a33a5ff30ba69702d818677da1715ab19169a4d5575f1c7c2755431193d48a40d4f80d11e6308120 WHIRLPOOL 9404f9938567bec86487969fa0e1af21cf83c8aa88344983c09a2380c279c3de7b9c4bcd8a41836ffc3ab9628bfe4f8a38c0c165f5d933adefc66fb589fdf5d6
+AUX sane-backends-1.0.24-cross-compile.patch 1031 SHA256 ee22b72f78c3443bc9e30190dcef2219dd25d7b377aae04b1cf32834ff5fd282 SHA512 8d42a2393e592b2c33b810c24c558a48ab2f42f8726661ab089429ea7756badc973293a042f4ab3d7f2ec57b7ae36e4594d64ff1cfa71cd9d828452d2b375724 WHIRLPOOL e2bec4a4360b85115f936518276bbdb767f7a07ed183445a48d0ea271165b7718f789e949dffd2d430330f138ba81ec394e4c3f115fd229a6efe7de99318188f
AUX sane-backends-1.0.24-kodakaio_avahi.patch 2900 SHA256 83f2a75a379fd964e8662d61394dd61d674bfaf5d4cf13d12725af83aaa36f7e SHA512 c00c01d2b7ad1770117403373ece89b14ff58ed23b6719b01f89c381dd88a1195c6c57c1d3ca25d7036ea21128a36f14675e7bfae0e6db671db24fb4c1422674 WHIRLPOOL ee3be39baa2a33615308d1805d0c5f59ae6e1b4e72f481ef0629c71f94f4d26dbd06e2dca12a969e883f0453e07953c1bfbc8cbafc19dca16f5ec1e2c86ceaeb
AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 SHA256 c95f305d01fd0dfb63944788f450d798a8882412f1d3e6da5c7e49f33cceba51 SHA512 49519b8fea68292b8cbd7bdcaf5b4803a1b890800e17015ace1d662e4503cc0844f191793c8f42cd6aa7e9922ee9f961d4784e30f22abc497973be1978bf1b24 WHIRLPOOL d72b314c7e4898c83a4c79e6fa39af978bd60e2b78afa58c1f8e1709b5f597292e965d330a58cd4109780fb2051dcd7880008f65d2b204fe476cbf3ce898e22b
AUX sane-backends-1.0.24-systemd_pkgconfig.patch 1324 SHA256 8a6a253e5869d0a5e9d3296b9e7525c892a74b12e25c8945fffeb52521efeaa8 SHA512 1d503302ef60e7a16d764997768a1aca3cf2a0109fc53d9c353761354aad2b34caa3dc2763c343fe1af6544021ed9c288f0e951e2d10218a80fd9d081aabb5d5 WHIRLPOOL 8e4df791a67f859d9f1893301bc238f1cf26d8568ffbfdefd7321d8e0f87ce5b079a378788af58b42f4506e15cac6bf7607410df2b54dae9b815a83b2134c28f
@@ -9,5 +10,5 @@ AUX saned 150 SHA256 d18856d6dd26fac11988fea5217c8616686ad3c0c024ad5437efbf0fd24
AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 WHIRLPOOL ede920bf5eb1ee59263296a2ccce1ab2da2b04669c2f8a58de1fc4fa76cc1eee501290eb4fdaece464bc184cc0cfb17d100e9309a33d79c06142a3f03c91b837
AUX saned.initd 300 SHA256 246507934c6b13b79aa4e00c58bdf8b067f9848b7f564ba962995f84b71b7f79 SHA512 530553f8aaa674d8b08f27fae4dc7992795b72d56b566d6155f26f7c4b837a98f8c7745e71b9c18fc1de993d0f66c756ad85fcc5b1bc8e438b195b3f60f996ef WHIRLPOOL 5e29ca205b3f7a1fcee35e24ad6ffba5ba927f07cf81bb3098440c157b62223693aa1255cab47c0b9d821511f036687f5f80afa40635adb08ed84c396189814c
DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
-EBUILD sane-backends-1.0.24-r99.ebuild 7540 SHA256 f69ad5a188025e6ed5b9852f2ab1b8680fd93ef9cbfb78458271c1b0457fac1d SHA512 9c1fdf3650f78e96c4b489d1aeb015543e4285b2cc394a7a9de0214546f9ed0c80d6b6e7414ba0fda9fed049db875c83a568e64826dfbdf37f845c0a4da46652 WHIRLPOOL 328382f6972e398ec3f08cb22163b7ffdb9f077e5d1174c20f1e7a9df87cbe85fd7d0ee1d6ed33a1bac8ce28b46e4b524a11ab2081a6048279b85d86c3eba43f
-MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
+EBUILD sane-backends-1.0.24-r6.ebuild 7642 SHA256 992a8f8af1502f8a84f554d6517fb70d52ea76de296d3a730658f6fc85c37892 SHA512 dc2556d9191c4718cce5aff0e264f984f8200b86629b73972cbf56f51b6f26963f5016721e1e07aeca2879f115a992dd1853a93722c1377fb4278f2c9c88c7ac WHIRLPOOL ad72656ed87540771a05fdf9ce7d3021d5ea200336c9de6a18ea75d8097673fd9f588373cbb6ad19efe70ebf35403cd0ac0cb7abc73e45cf2d071582a22ce4e2
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
new file mode 100644
index 00000000..d66edacb
--- /dev/null
+++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
@@ -0,0 +1,30 @@
+sent upstream:
+https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033600.html
+
+From c8df148e2b9784be1827e33224baa1cb5066a383 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Wed, 8 Jul 2015 06:31:12 -0400
+Subject: [PATCH] fix cross-compiling paths
+
+There's no reason to hardcode -I paths to /usr/local. Doing so breaks
+cross-compiling when incompatible headers live in there or the toolchain
+is set up to throw errors with those flags.
+---
+ configure.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 48953d2..059058b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,7 +82,6 @@ AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
+ dnl ***********************************************************************
+ dnl set compiler/linker flags
+ dnl ***********************************************************************
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+ AC_SUBST(INCLUDES)
+ SANE_SET_CFLAGS([$is_release])
+ SANE_SET_LDFLAGS
+--
+2.4.4
+
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 097975e3..6f49eba8 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild
index ff4b890a..854bcb31 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.24-r99.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.24-r6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
@@ -122,7 +121,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz"
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
@@ -184,6 +183,7 @@ src_prepare() {
"${FILESDIR}"/${P}-systemd_pkgconfig.patch \
"${FILESDIR}"/${P}-kodakaio_avahi.patch \
"${FILESDIR}"/${P}-saned_pidfile_location.patch \
+ "${FILESDIR}"/${P}-cross-compile.patch \
"${FILESDIR}"/${P}-u_char.patch
# Fix for "make check".
sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html*