components/sane-backends/patches/backends.patch

   1 --- sane-backends-1.0.19/configure      Sun Feb 10 15:02:31 2008
   2 +++ sane-backends-1.0.19/configure      Mon May 30 19:25:06 2011
   3 @@ -3951,8 +3951,8 @@
   4
   5
   6
   7 +MAKEDEPEND=no
   8
   9 -
  10  if test "$MAKEDEPEND" != "no"; then
  11    DEPEND_RECURSIVE="depend-recursive"
  12  fi
  13 --- sane-backends-1.0.19/backend/plustek-usb.h  Mon Dec 17 06:28:13 2007
  14 +++ sane-backends-1.0.19/backend/plustek-usb.h  Mon May 30 19:25:08 2011
  15 @@ -130,22 +130,28 @@
  16  #define _PHILO2WORD(x)  ((u_short)x->bHi * 256U + x->bLo)
  17  #define _PLOHI2WORD(x)  ((u_short)x->bLo * 256U + x->bHi)
  18
  19 -#define PACKED8  __attribute__ ((packed,aligned(1)))
  20 -#define PACKED16 __attribute__ ((packed,aligned(2)))
  21 +/* change to use Sun Studio CC */
  22
  23 +/* #define PACKED8  __attribute__ ((packed,aligned(1))) */
  24 +/* #define PACKED16 __attribute__ ((packed,aligned(2))) */
  25 +
  26 +#pragma pack(1)
  27  /* useful for RGB-values */
  28  typedef struct {
  29         u_char Red;
  30         u_char Green;
  31         u_char Blue;
  32 -} PACKED8 RGBByteDef;
  33 +} /*PACKED8*/ RGBByteDef;
  34
  35 +#pragma pack(2)
  36  typedef struct {
  37         u_short Red;
  38         u_short Green;
  39         u_short Blue;
  40 -} PACKED16 RGBUShortDef;
  41 +} /*PACKED16*/ RGBUShortDef;
  42
  43 +#pragma pack()
  44 +
  45  typedef struct {
  46         u_long Red;
  47         u_long Green;
  48 @@ -152,25 +158,29 @@
  49         u_long Blue;
  50  } RGBULongDef;
  51
  52 +#pragma pack(1)
  53  typedef struct {
  54         u_char a_bColor[3];
  55 -} PACKED8 ColorByteDef;
  56 +} /*PACKED8*/ ColorByteDef;
  57
  58  typedef struct {
  59         u_char bHi;
  60         u_char bLo;
  61 -} PACKED8 HiLoDef;
  62 +} /*PACKED8*/ HiLoDef;
  63
  64 +#pragma pack(2)
  65  typedef union {
  66         HiLoDef HiLo[3];
  67         u_short Colors[3];
  68 -} PACKED16 ColorWordDef;
  69 +} /*PACKED16*/ ColorWordDef;
  70
  71  typedef union {
  72         HiLoDef HiLo;
  73         u_short Mono;
  74 -} PACKED16 MonoWordDef;
  75 +} /*PACKED16*/ MonoWordDef;
  76
  77 +#pragma pack()
  78 +
  79  typedef union {
  80
  81         u_char       *pb;
  82 @@ -182,7 +192,7 @@
  83         RGBUShortDef *pw_rgb;
  84         HiLoDef      *philo;
  85
  86 -} __attribute__ ((aligned(4)))  AnyPtr;
  87 +} /*__attribute__ ((aligned(4)))*/  AnyPtr;
  88
  89  typedef struct {
  90         unsigned short x;
  91 --- sane-backends-1.0.19/backend/hp5590_cmds.c  Wed Nov 28 03:43:39 2007
  92 +++ sane-backends-1.0.19/backend/hp5590_cmds.c  Mon May 30 19:25:06 2011
  93 @@ -154,6 +154,9 @@
  94  #define CMD_START_SCAN         0x051b
  95  #define CMD_BUTTON_STATUS      0x0020
  96
  97 +/* change attribute keyword to #pragma to use Sun Studio */
  98 +
  99 +#pragma pack(1)
 100  struct init_resp
 101  {
 102    u_int8_t     flags;                  /* bit 0 - TMA, bit 1 - ADF, bit 3 - LCD present */
 103 @@ -167,13 +170,13 @@
 104    u_int8_t     pad2[8];                /* 00 00 00 00 00 00 00 00 */
 105    u_int16_t    motor_param_normal;     /* 00 64 = 100 */
 106    u_int16_t    motor_param_max;        /* 03 E8 = 1000 */
 107 -} __attribute__ ((packed));
 108 +}; /* __attribute__ ((packed)); */
 109
 110  struct power_resp
 111  {
 112    u_int8_t flags;
 113    u_int16_t unk1;
 114 -} __attribute__ ((packed));
 115 +}; /* __attribute__ ((packed)); */
 116
 117  /*
 118   * 215.9 mm x 297.2 mm
 119 @@ -347,7 +350,7 @@
 120                                  *
 121                                  * bw 1200                              : 04 f5 =  1269
 122                                  */
 123 -} __attribute__ ((packed));
 124 +}; /*__attribute__ ((packed)); */
 125
 126  struct image_params
 127  {
 128 @@ -395,7 +398,7 @@
 129    u_int16_t line_width;
 130    u_int16_t real_size_y;
 131    u_int32_t pad3;              /* 00 00 00 00 */
 132 -} __attribute__ ((packed));
 133 +}; /*__attribute__ ((packed));*/
 134
 135  struct lamp_state
 136  {
 137 @@ -402,7 +405,7 @@
 138    u_int8_t     unk1;           /* 02 */
 139    u_int8_t     flag;           /* 01 on start, 02 - TMA, 03 - all other */
 140    u_int16_t    turnoff_time;   /* 0a 0a, 03 36, 0f 36 */
 141 -} __attribute__ ((packed));
 142 +};/* __attribute__ ((packed));*/
 143
 144  struct color_map
 145  {
 146 @@ -409,7 +412,7 @@
 147    u_int8_t     color1[6];      /* 00 00 00 00 01 00 */
 148    u_int8_t     color2[6];      /* 00 00 00 00 01 00 */
 149    u_int8_t     color3[6];      /* 00 00 00 00 01 00 */
 150 -} __attribute__ ((packed));
 151 +};/* __attribute__ ((packed)); */
 152
 153  struct reg_03
 154  {
 155 @@ -416,8 +419,10 @@
 156    u_int8_t     unk1;           /* 0x0b - ADF ready, 0x03 - not */
 157    u_int8_t     unk2;           /* 0x80 */
 158    u_int8_t     adf_flags;      /* 0x01 - ADF ready when selected, 0x02 - not */
 159 -} __attribute__ ((packed));
 160 +};/* __attribute__ ((packed));*/
 161
 162 +#pragma pack()
 163 +
 164  /******************************************************************************/
 165  static SANE_Status
 166  hp5590_vendor_product_id (enum hp_scanner_types scanner_type,
 167 --- sane-backends-1.0.19/backend/hp5590_low.c   Sat Feb  2 23:47:55 2008
 168 +++ sane-backends-1.0.19/backend/hp5590_low.c   Mon May 30 19:25:07 2011
 169 @@ -65,12 +65,14 @@
 170    return SANE_STATUS_INVAL; \
 171  }
 172
 173 +/* change attribute keyword to #pragma to use Sun Studio */
 174 +#pragma pack(1)
 175  /* Structure describing bulk transfer size */
 176  struct bulk_size
 177  {
 178    u_int16_t    size;
 179    u_int8_t     unused;
 180 -} __attribute__ ((packed));
 181 +}; /* __attribute__ ((packed));*/
 182
 183  /* Structure describing bulk URB */
 184  /* FIXME: Verify according to USB standard */
 185 @@ -82,7 +84,7 @@
 186    u_int16_t    unknown;
 187    u_int16_t    wLength;
 188    u_int8_t     pad;
 189 -} __attribute__ ((packed));
 190 +}; /* __attribute__ ((packed)); */
 191
 192  /* Structure describing control URB */
 193  struct usb_in_usb_ctrl_setup {
 194 @@ -91,8 +93,10 @@
 195    u_int16_t wValue;
 196    u_int16_t wIndex;
 197    u_int16_t wLength;
 198 -} __attribute__ ((packed));
 199 +}; /* __attribute__ ((packed)); */
 200
 201 +#pragma pack()
 202 +
 203  /* CORE status flag - ready or not */
 204  #define CORE_FLAG_NOT_READY            1 << 1
 205
 206 --- sane-backends-1.0.19/doc/sane-mustek_pp.man Sun Feb 11 09:36:31 2007
 207 +++ sane-backends-1.0.19/doc/sane-mustek_pp.man Mon May 30 19:25:09 2011
 208 @@ -422,7 +422,7 @@
 209  levels reduce verbosity.
 210  .sp
 211  .TS
 212 -lb lb;
 213 +lb lb
 214  l l.
 215  level  debug output
 216  -      -
 217 @@ -441,7 +441,7 @@
 218  million lines of debug output.
 219  .sp
 220  .TS
 221 -lb lb;
 222 +lb lb
 223  l l.
 224  level  debug output
 225  -      -
 226 --- sane-backends-1.0.19/backend/Makefile.in    Fri May 20 00:42:26 2011
 227 +++ sane-backends-1.0.19/backend/Makefile.in    Fri May 20 01:38:02 2011
 228 @@ -208,6 +208,32 @@
 229    umax1220u.c umax1220u-common.c umax1220u.conf.in \
 230    v4l.c v4l.conf.in v4l-frequencies.h v4l.h
 231
 232 +BACKEND_CONFS =  abaton.conf agfafocus.conf apple.conf \
 233 +  artec.conf artec_eplus48u.conf avision.conf \
 234 +  bh.conf canon.conf canon630u.conf \
 235 +  canon_pp.conf cardscan.conf coolscan.conf \
 236 +  coolscan2.conf dc210.conf dc240.conf \
 237 +  dc25.conf dell1600n_net.conf dll.conf \
 238 +  dmc.conf epjitsu.conf epson.conf \
 239 +  epson2.conf fujitsu.conf genesys.conf \
 240 +  gphoto2.conf gt68xx.conf hp.conf \
 241 +  hp3900.conf hp4200.conf hp5400.conf \
 242 +  hpsj5s.conf hs2p.conf ibm.conf \
 243 +  leo.conf lexmark.conf ma1509.conf \
 244 +  matsushita.conf microtek.conf microtek2.conf \
 245 +  mustek.conf mustek_pp.conf mustek_usb.conf \
 246 +  nec.conf net.conf pie.conf \
 247 +  plustek.conf plustek_pp.conf qcam.conf \
 248 +  ricoh.conf s9036.conf saned.conf \
 249 +  sceptre.conf sharp.conf sm3840.conf \
 250 +  snapscan.conf sp15c.conf st400.conf \
 251 +  stv680.conf tamarack.conf teco1.conf \
 252 +  teco2.conf teco3.conf test.conf \
 253 +  u12.conf umax.conf umax1220u.conf \
 254 +  umax_pp.conf v4l.conf \
 255 +
 256 +SUFFIXES = .conf.in .conf
 257 +
 258  .PHONY: all clean depend dist distclean install uninstall
 259
 260  libsane-%.la: %.lo %-s.lo $(EXTRA) $(LIBOBJS)
 261 @@ -231,6 +257,9 @@
 262
 263  all:   $(LIBS) libsane.la becfg
 264
 265 +.SUFFIXES:
 266 +.SUFFIXES: .conf.in .conf
 267 +
 268  install: $(INSTALL_LOCKPATH) install-be@BE_INSTALL_FLAVOR@ install-libsane install-becfg
 269
 270  install-be:
 271 @@ -323,8 +352,8 @@
 272                 -rpath $(libdir) -version-info $(V_MAJOR):$(V_REV):$(V_MINOR)
 273
 274  # Generate .conf files for all existing .conf.in files
 275 -becfg: $(patsubst %.conf.in,%.conf,$(wildcard *.conf.in))
 276 -%.conf: %.conf.in
 277 +becfg: $(BACKEND_CONFS)
 278 +.conf.in.conf:
 279         @echo Generating $@ from $^
 280         @sed -e 's|@DATADIR@|$(datadir)|g' \
 281              -e 's|@CONFIGDIR@|$(configdir)|g' \
 282 --- sane-backends-1.0.19/tools/Makefile.in      Thu May 19 17:46:16 2011
 283 +++ sane-backends-1.0.19/tools/Makefile.in      Thu May 19 18:24:03 2011
 284 @@ -110,7 +110,7 @@
 285         @$(LIBTOOL) $(MLINK) $(LINK) gamma4scanimage.o -lm
 286
 287  ../backend/umax_pp_low.o: ../backend/umax_pp_low.c
 288 -       $(COMPILE) ../backend/umax_pp_low.c -o ../backend/umax_pp_low.o \
 289 +       $(COMPILE) $< -o ../backend/umax_pp_low.o \
 290           -DBACKEND_NAME=umax_pp_low
 291
 292  umax_pp: umax_pp.o ../backend/umax_pp_low.o
 293 @@ -119,23 +119,26 @@
 294  sane-desc: sane-desc.o
 295         @$(LIBTOOL) $(MLINK) $(LINK) sane-desc.o $(LIBSANEI) $(LIBLIB)
 296
 297 -hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
 298 +hotplug/libsane.usermap: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc | output-dir
 299         @./sane-desc -m usermap -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 300            -d 1 > $@
 301
 302 -hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
 303 +hotplug-ng/libsane.db: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc | output-dir
 304         @./sane-desc -m db -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 305            -d 0 > $@
 306
 307 -udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
 308 +udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc | output-dir
 309         @./sane-desc -m udev -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 310            -d 0 > $@
 311
 312 -hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
 313 +hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc | output-dir
 314         @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
 315            -d 0 > $@
 316
 317 +output-dir:
 318 +       mkdir hotplug hotplug-ng udev hal
 319
 320 +
 321  depend:
 322         makedepend $(INCLUDES) *.c 2>/dev/null
 323