media-gfx/sane-backends: Drop old

Package-Manager: Portage-2.3.10, Repoman-2.3.3

6 files changed, 0 insertions, 447 deletions

diff --git a/media-gfx/sane-backends/files/niash_array_index.patch b/media-gfx/sane-backends/files/niash_array_index.patch
deleted file mode 100644
index 236c4598b581..000000000000
--- a/media-gfx/sane-backends/files/niash_array_index.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- backend/niash.c	2010-12-02 00:49:58.000000000 +0100
-+++ backend/niash.c.new	2011-09-21 20:09:07.000000000 +0200
-@@ -82,14 +82,7 @@
-   optThreshold,
- 
- 
--  optLast,
--/* put temporarily disabled options here after optLast */
--
--  optGroupMisc,
--  optLamp,
--
--  optCalibrate,
--  optGamma                      /* analog gamma = single number */
-+  optLast
- } EOptionIndex;
- 
- 
-@@ -685,17 +678,6 @@
-           pDesc->size = 0;
-           break;
- 
--        case optGamma:
--          pDesc->name = SANE_NAME_ANALOG_GAMMA;
--          pDesc->title = SANE_TITLE_ANALOG_GAMMA;
--          pDesc->desc = SANE_DESC_ANALOG_GAMMA;
--          pDesc->type = SANE_TYPE_FIXED;
--          pDesc->constraint_type = SANE_CONSTRAINT_RANGE;
--          pDesc->constraint.range = &rangeGamma;
--          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
--          pVal->w = startUpGamma;
--          break;
--
-         case optGammaTable:
-           pDesc->name = SANE_NAME_GAMMA_VECTOR;
-           pDesc->title = SANE_TITLE_GAMMA_VECTOR;
-@@ -707,31 +689,6 @@
-           pVal->wa = s->aGammaTable;
-           break;
- 
--        case optGroupMisc:
--          pDesc->title = SANE_I18N ("Miscellaneous");
--          pDesc->type = SANE_TYPE_GROUP;
--          pDesc->size = 0;
--          break;
--
--        case optLamp:
--          pDesc->name = "lamp";
--          pDesc->title = SANE_I18N ("Lamp status");
--          pDesc->desc = SANE_I18N ("Switches the lamp on or off.");
--          pDesc->type = SANE_TYPE_BOOL;
--          pDesc->cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT;
--          /* switch the lamp on when starting for first the time */
--          pVal->w = SANE_TRUE;
--          break;
--
--        case optCalibrate:
--          pDesc->name = "calibrate";
--          pDesc->title = SANE_I18N ("Calibrate");
--          pDesc->desc = SANE_I18N ("Calibrates for black and white level.");
--          pDesc->type = SANE_TYPE_BUTTON;
--          pDesc->cap = SANE_CAP_SOFT_SELECT;
--          pDesc->size = 0;
--          break;
--
-         case optGroupMode:
-           pDesc->title = SANE_I18N ("Scan Mode");
-           pDesc->desc = "";
-@@ -1007,7 +964,6 @@
-           /* Get options of type SANE_Word */
-         case optCount:
-         case optDPI:
--        case optGamma:
-         case optTLX:
-         case optTLY:
-         case optBRX:
-@@ -1031,17 +987,6 @@
-           strcpy ((char *) pVal, modeList[s->aValues[optMode].w]);
-           break;
- 
--          /* Get options of type SANE_Bool */
--        case optLamp:
--          GetLamp (&s->HWParams, &fLampIsOn);
--          *(SANE_Bool *) pVal = fLampIsOn;
--          break;
--
--        case optCalibrate:
--          /*  although this option has nothing to read,
--             it's added here to avoid a warning when running scanimage --help */
--          break;
--
-         default:
-           DBG (DBG_MSG, "SANE_ACTION_GET_VALUE: Invalid option (%d)\n", n);
-         }
-@@ -1061,7 +1006,6 @@
-         case optCount:
-           return SANE_STATUS_INVAL;
- 
--        case optGamma:
-         case optThreshold:
-         case optDPI:
- 
-@@ -1089,15 +1033,7 @@
-           DBG (DBG_MSG,
-                "sane_control_option: SANE_ACTION_SET_VALUE %d = %d\n", n,
-                (int) s->aValues[n].w);
--          if (n == optGamma)
--            {
--              if (!fSame && optLast > optGammaTable)
--                {
--                  info |= SANE_INFO_RELOAD_OPTIONS;
--                }
--              _SetScalarGamma (s->aGammaTable, s->aValues[n].w);
--            }
--          break;
-+         break;
- 
-         case optGammaTable:
-           DBG (DBG_MSG, "Writing gamma table\n");
-@@ -1158,20 +1094,6 @@
-           break;
- 
- 
--
--        case optLamp:
--          fVal = *(SANE_Bool *) pVal;
--          DBG (DBG_MSG, "lamp %s\n", fVal ? "on" : "off");
--          if (fVal)
--            _WarmUpLamp (s, WARMUP_INSESSION);
--          else
--            SetLamp (&s->HWParams, SANE_FALSE);
--          break;
--
--        case optCalibrate:
--/*       SimpleCalib(&s->HWParams); */
--          break;
--
-         default:
-           DBG (DBG_ERR, "SANE_ACTION_SET_VALUE: Invalid option (%d)\n", n);
-         }
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
deleted file mode 100644
index 7db51b061c1a..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-automagic_systemd.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-sent upstream:
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033601.html
-
-From 867c8fcde5cf54afae7f9ae8f855605b891708a7 Mon Sep 17 00:00:00 2001
-From: Christopher Brannon <teiresias@gentoo.org>
-Date: Wed, 8 Jul 2015 06:37:14 -0400
-Subject: [PATCH] add a configure flag to control systemd support
-
-This way people can easily disable systemd support locally.
----
- configure.in | 29 ++++++++++++++++++-----------
- 1 file changed, 18 insertions(+), 11 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 059058b..b539cda 100644
---- a/configure.in
-+++ b/configure.in
-@@ -343,17 +343,24 @@ dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
- dnl 	with_cups="no"
- dnl fi
- 
--dnl added by llagendijk 12/7/2012 to detect systemd for saned
--$as_echo_n "Checking for systemd..."
--if test -e /usr/include/systemd/sd-daemon.h ; then
--    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
--    with_systemd="yes"
--    SYSTEMD_LIBS=" -lsystemd-daemon"
--    AC_SUBST(SYSTEMD_LIBS)
--    $as_echo "yes"
--else
--    with_systemd="no"
--    $as_echo "no"
-+AC_ARG_WITH(systemd,
-+	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
-+if test "x$with_systemd" != xno ; then
-+    dnl added by llagendijk 12/7/2012 to detect systemd for saned
-+    $as_echo_n "Checking for systemd..."
-+    if test -e /usr/include/systemd/sd-daemon.h ; then
-+	AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+	have_systemd="yes"
-+	SYSTEMD_LIBS=" -lsystemd-daemon"
-+	AC_SUBST(SYSTEMD_LIBS)
-+	$as_echo "yes"
-+    else
-+	have_systemd="no"
-+	$as_echo "no"
-+	if test "x$with_systemd" = xyes; then
-+	    AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-+	fi
-+    fi
- fi
- 
- dnl ***********
--- 
-2.4.4
-
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
deleted file mode 100644
index d66edacbae80..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-cross-compile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/files/sane-backends-1.0.24-kodakaio_avahi.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
deleted file mode 100644
index 80b12f011218..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-kodakaio_avahi.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-taken from upstream
-
-From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
-From: Paul Newall <quandry@ntlworld.com>
-Date: Mon, 14 Oct 2013 22:22:53 +0100
-Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
- return unexpected data via avahi auto discovery
-
----
- ChangeLog                      |  4 ++++
- backend/kodakaio.c             | 43 +++++++++++++++++++++++++++++++-----------
- doc/descriptions/kodakaio.desc |  2 +-
- 3 files changed, 37 insertions(+), 12 deletions(-)
-
-2013-10-14 Paul Newall <quandry@ntlworld.com>
-	* backend/kodakaio.c: fix bug #314301, 
-	Segfault when unexpected data returned by avahi auto discovery.
-
-diff --git a/backend/kodakaio.c b/backend/kodakaio.c
-index 8c4583a..b442e50 100644
---- a/backend/kodakaio.c
-+++ b/backend/kodakaio.c
-@@ -127,7 +127,7 @@ for ubuntu 12.10
- 
- #define KODAKAIO_VERSION	02
- #define KODAKAIO_REVISION	4
--#define KODAKAIO_BUILD		6
-+#define KODAKAIO_BUILD		7
- 
- /* for usb (but also used for net though it's not required). */
- #define MAX_BLOCK_SIZE		32768
-@@ -2184,6 +2184,7 @@ static void resolve_callback(
-     AvahiLookupResultFlags flags,
-     AVAHI_GCC_UNUSED void* userdata) {
- 
-+	AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
- 	char *pidkey, *pidvalue;
- 	char *vidkey, *vidvalue;
- 	size_t valuesize;
-@@ -2204,20 +2205,40 @@ static void resolve_callback(
-             avahi_address_snprint(a, sizeof(a), address);
- 
- /* Output short for Kodak ESP */
--	DBG(min(10,DBG_AUTO), "%s:%u  %s  ", a,port,host_name);
--	avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), 
--		&vidkey, &vidvalue, &valuesize);
--	DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
--	avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), 
--		&pidkey, &pidvalue, &valuesize);
--	DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	DBG(min(10,DBG_AUTO), "%s:%u  %s\n", a,port,host_name);
- 
-+	vid_pair_list = avahi_string_list_find(txt, "vid");
-+	if(vid_pair_list != NULL) {
-+		avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key vid\n");
-+
-+	pid_pair_list = avahi_string_list_find(txt, "pid");
-+	if(pid_pair_list != NULL) {
-+		avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
-+		DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
-+	}
-+	else	DBG(min(10,DBG_AUTO), "failed to find key pid\n");
-+
-+	if(pid_pair_list != NULL && vid_pair_list != NULL) {
- 		ProcessAvahiDevice(name, vidvalue, pidvalue, a);
--	avahi_free(vidkey); avahi_free(vidvalue);
--	avahi_free(pidkey); avahi_free(pidvalue);
-+	}
-+	else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
-+
-+	if(vid_pair_list != NULL) {
-+		avahi_free(vidkey); 
-+		avahi_free(vidvalue);
-+		DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
-+	}
-+	if(pid_pair_list != NULL) {
-+		avahi_free(pidkey); 
-+		avahi_free(pidvalue);
-+		DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
-+	}
-         }
-     }
--
-+    DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
-     avahi_service_resolver_free(r);
- }
- 
-diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
-index 7882513..5fb18ed 100644
---- a/doc/descriptions/kodakaio.desc
-+++ b/doc/descriptions/kodakaio.desc
-@@ -1,6 +1,6 @@
- :backend "kodakaio"
- :url "http://sourceforge.net/projects/cupsdriverkodak/" 
--:version "2.4.6"
-+:version "2.4.7"
- :manpage "sane-kodakaio"
- :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
- :devicetype :scanner
--- 
-2.4.4
-
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
deleted file mode 100644
index b87ca8a30632..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-sent upstream:
-https://lists.alioth.debian.org/pipermail/sane-devel/2015-July/033602.html
-
-From 1dcfb42608a27fbdebdaa721b4e48354850a7dcc Mon Sep 17 00:00:00 2001
-From: Christopher Brannon <teiresias@gentoo.org>
-Date: Wed, 8 Jul 2015 06:38:50 -0400
-Subject: [PATCH] use pkg-config to look up systemd paths
-
-Since systemd has always shipped pkg-config files, we should use them.
-This also fixes cross-compiling by not relying on hardcoded host paths.
----
- configure.in | 25 +++++++++++--------------
- 1 file changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index b539cda..5e703a8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -346,21 +346,18 @@ dnl fi
- AC_ARG_WITH(systemd,
- 	AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@]))
- if test "x$with_systemd" != xno ; then
--    dnl added by llagendijk 12/7/2012 to detect systemd for saned
--    $as_echo_n "Checking for systemd..."
--    if test -e /usr/include/systemd/sd-daemon.h ; then
--	AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
--	have_systemd="yes"
--	SYSTEMD_LIBS=" -lsystemd-daemon"
--	AC_SUBST(SYSTEMD_LIBS)
--	$as_echo "yes"
--    else
--	have_systemd="no"
--	$as_echo "no"
--	if test "x$with_systemd" = xyes; then
--	    AC_MSG_ERROR([Systemd support was requested but systemd was not found])
--	fi
-+  PKG_CHECK_MODULES(SYSTEMD, [libsystemd], have_systemd=yes, have_systemd=no)
-+  if test "x$have_systemd" = xno; then
-+    PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon], have_systemd=yes, have_systemd=no)
-+  fi
-+  if test "x$have_systemd" = xyes; then
-+    AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?])
-+    AC_SUBST(SYSTEMD_LIBS)
-+  else
-+    if test "x$with_systemd" = xyes; then
-+      AC_MSG_ERROR([Systemd support was requested but systemd was not found])
-     fi
-+  fi
- fi
- 
- dnl ***********
--- 
-2.4.4
-
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
deleted file mode 100644
index a7c95d991bb4..000000000000
--- a/media-gfx/sane-backends/files/sane-backends-1.0.24-unused-cups.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-taken from upstream
-
-From efb04936b8ad3bf313c289a522ae5832e22c1b7e Mon Sep 17 00:00:00 2001
-From: Paul Newall <quandry@ntlworld.com>
-Date: Tue, 15 Oct 2013 22:20:15 +0100
-Subject: [PATCH] detection of cups commented out in configure.in it is no
- longer used by kodakaio.
-
----
- ChangeLog    |  4 ++++
- configure.in | 24 ++++++++++++------------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-2013-10-15 Paul Newall <quandry@ntlworld.com>
-	* configue.in: detection of cups was commented out. Avahi is now used
-	for autodetection in kodakaio so the detection of cups is no longer required.
-
-diff --git a/configure.in b/configure.in
-index e13888c..4365868 100644
---- a/configure.in
-+++ b/configure.in
-@@ -332,17 +332,17 @@ if test -c /dev/urandom ; then
-     AC_DEFINE(HAVE_DEV_URANDOM, 1, [Is /dev/urandom available?])
- fi
- 
--dnl added by PN 3/2/12 to detect cups
--$as_echo "checking for cups"
--if test -e /usr/include/cups/cups.h ; then
--    AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
--	with_cups="yes"
--	LIBS="-lcups  $LIBS"
--else
--	$as_echo "cups.h not found, you may want to install a cups development package"
--	$as_echo "in order to autodetect network scanners in kodakaio."
--	with_cups="no"
--fi
-+dnl added by PN 3/2/12 to detect cups commented out 15/10/13 since avahi is now used instead
-+dnl $as_echo "checking for cups"
-+dnl if test -e /usr/include/cups/cups.h ; then
-+dnl     AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
-+dnl 	with_cups="yes"
-+dnl 	LIBS="-lcups  $LIBS"
-+dnl else
-+dnl 	$as_echo "cups.h not found, you may want to install a cups development package"
-+dnl 	$as_echo "in order to autodetect network scanners in kodakaio."
-+dnl 	with_cups="no"
-+dnl fi
- 
- dnl added by llagendijk 12/7/2012 to detect systemd for saned
- $as_echo_n "Checking for systemd..."
-@@ -816,7 +816,7 @@ fi
- echo "IPv6 support:  `eval eval echo ${ipv6}`"
- echo "Avahi support: `eval eval echo ${enable_avahi}`"
- echo "SNMP support:  `eval eval echo ${with_snmp}`"
--echo "CUPS support:  `eval eval echo ${with_cups}`"
-+dnl echo "CUPS support:  `eval eval echo ${with_cups}`" commented out 15/10/13
- echo "-> The following backends will be built:"
- for backend in ${BACKENDS} ; do
-   echo $ECHO_N "${backend} " 
--- 
-2.4.4
-