pool/sane-backends
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 281288 from home:msmeissn:branches:graphics

Browse Source 
redid johannes submission with changes entry
- MG5550-works.patch: support Canon Pixma MG5500

OBS-URL: https://build.opensuse.org/request/show/281288
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=76
This commit is contained in:
OBS User mrdocs 2015-01-17 03:41:04 +00:00 committed by Git OBS Bridge
parent 6b1e6b0940
commit b6bbb4634e
3 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
MG5550-works.patch Normal file
View File

@ -0,0 +1,60 @@
diff -ur sane-backends-1.0.24.orig/backend/pixma_mp150.c sane-backends-1.0.24/backend/pixma_mp150.c
--- sane-backends-1.0.24.orig/backend/pixma_mp150.c 2013-09-18 02:43:00.000000000 +0200
+++ sane-backends-1.0.24/backend/pixma_mp150.c 2015-01-11 12:45:24.644527570 +0100
@@ -1139,6 +1139,7 @@
&& s->cfg->pid != MG3100_PID
&& s->cfg->pid != MG2100_PID
&& s->cfg->pid != MG5300_PID
+ && s->cfg->pid != MG5500_PID
&& s->cfg->pid != MG6300_PID)
reorder_pixels (mp->linebuf, sptr, c, n, m, s->param->wx, line_size);
diff -ur sane-backends-1.0.24.orig/ChangeLog sane-backends-1.0.24/ChangeLog
--- sane-backends-1.0.24.orig/ChangeLog 2013-10-01 03:23:49.000000000 +0200
+++ sane-backends-1.0.24/ChangeLog 2015-01-11 12:22:30.607870381 +0100
@@ -1,3 +1,7 @@
+2014-09-18 Rolf Bensch <rolf at bensch hyphen online dot de>
+ * backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+ Canon Pixma MG5500 Series is working, bug #314819.
+
****** Release of sane-backends 1.0.24. End of code freeze ******
2013-09-30 m. allan noah <kitno455 at gmail dot com>
diff -ur sane-backends-1.0.24.orig/doc/descriptions/pixma.desc sane-backends-1.0.24/doc/descriptions/pixma.desc
--- sane-backends-1.0.24.orig/doc/descriptions/pixma.desc 2013-10-01 02:10:43.000000000 +0200
+++ sane-backends-1.0.24/doc/descriptions/pixma.desc 2015-01-11 12:32:20.834566730 +0100
@@ -127,10 +127,10 @@
:comment "Testers needed!"
:model "PIXMA MG5500 Series"
-:interface "USB"
+:interface "USB WiFi"
:usbid "0x04a9" "0x1771"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 1200DPI)."
:model "PIXMA MG6100 Series"
:interface "USB"
diff -ur sane-backends-1.0.24.orig/doc/sane-pixma.man sane-backends-1.0.24/doc/sane-pixma.man
--- sane-backends-1.0.24.orig/doc/sane-pixma.man 2013-10-01 02:10:43.000000000 +0200
+++ sane-backends-1.0.24/doc/sane-pixma.man 2015-01-11 12:39:28.205594376 +0100
@@ -15,7 +15,7 @@
Currently, the following models work with this backend:
.PP
.RS
-PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300
+PIXMA MG2100, MG3100, MG4200, MG5100, MG5200, MG5300, MG5500
.br
PIXMA MG6100, MG6200, MG6300, MG8200
.br
@@ -77,7 +77,7 @@
.RS
PIXMA E500, E510, E600, E610
.br
-PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400, MG5500
+PIXMA MG2200, MG2400, MG2500, MG3200, MG4100, MG5400
.br
PIXMA MG6400, MG6500, MG7100, MG8100
.br

5
sane-backends.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 14 12:41:18 UTC 2015 - johannes@lst.de
- MG5550-works.patch: support Canon Pixma MG5500
-------------------------------------------------------------------
Tue Dec 3 11:09:25 CET 2013 - jsmeix@suse.de

8
sane-backends.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sane-backends
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -188,6 +188,11 @@ Patch109: adapt_epkowa.desc_for_yast2-scanner.patch
# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366
Patch110: avision.conf.patch
Patch111: avision.c.patch
# unchanged git checkin http://anonscm.debian.org/cgit/sane/sane-backends.git/commit/?id=54358f27e1d6cf8b537866d8034919fcbebea1f1
# remove for upstream version 25
Patch112: MG5550-works.patch
# Install into this non-root directory (required when norootforbuild is used):
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Prerequire /sbin/ldconfig which is used in the traditional bash scriptlets for post/postun:
@ -282,6 +287,7 @@ package or remove it when it is already installed.
# https://alioth.debian.org/tracker/index.php?func=detail&aid=314108&group_id=30186&atid=410366
%patch110
%patch111
%patch112 -p1
# Source100... is SUSE specific stuff:
# Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
# because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.