Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sane-backends: import from oldpackages (v2) #1799

Merged
merged 1 commit into from Oct 13, 2015
Merged

Conversation

luizluca
Copy link
Contributor

Changes since oldpackages:

  • updated to 1.0.25
    • most of openwrt patches are upstreamed now
  • cups dependency was completely removed (upstream now)
    • This also happened in sane trunk version musl patch
  • added detection of inb,outb (link error with musl) (upstream now)
    • this also removes hack 020-non-i386-qcam.patch
  • fix for segfault when using sane-test backend
  • removed link to extra libraries in libsane (used only for preload backends)
  • added format-security fix (upstream now)
  • sane-libs and sane-backends merged and exploded into
    individual packages for each backend:
    • libsane for sane library (which backends should dep on)
    • sane-daemon for saned daemon
    • sane-xxx for sane backend for xxx
      • each backend has its own custom dep libraries
    • sane-backends-all (with no files) that deps on all backends
    • sane-qcam is only available for x86/x86_64
      • other archs does not implement inb/outb (at least in musl)

Now it is possible to use SANE with much less FS space (KB
instead of MB).

Signed-off-by: Luiz Angelo Daros de Luca luizluca@gmail.com

This is the second try of #1724, which was reverted (#1778) because it failed when parsed with gnu make <4 (#1777). I did some refactoring in order to isolate the problem. In the end, this works fine in Package/xxx/config with make v4:

    $(eval
      $(call Package/Default)
      $(call Package/sane-$(backend))
    )\

While it fails (silently) with v3. I needed to add a backslash after eval to be compatible with v3:

    $(eval \
      $(call Package/Default)
      $(call Package/sane-$(backend))
    )\ 

And some more similar problems. It seems that gnu make v3 and v4 parser are different beasts. And I think that this is not intentional as these type of breakage is not mentioned in NEWS but maybe it is related to this.

This PR version should be compatible with make v3.81 (ubuntu 14.04) and make v4.0 (ubuntu 15.04). At least, the feeds/packages.tmp/.packageinfo is fine now.

@plntyk, @love4taylor, @sbyx, @hnyman, thanks for the help and sorry for the trouble.

@luizluca
Copy link
Contributor Author

Now a new sane-backend was released, including fixes from OpenWRT.
PR was updated.

Changes since oldpackages:
- updated to 1.0.25
  * most of openwrt patches are upstreamed now
- cups dependency was completely removed
- small musl patch
- small uclibc patch
- removed link to extra libraries in libsane (used only
  for preload backends)
- sane-libs and sane-backends merged and exploded into
  individual packages for each backend:
  * libsane for sane library (which backends should dep on)
  * sane-daemon for saned daemon
  * sane-xxx for sane backend for xxx
  ** each backend has its own custom dep libraries
  * sane-backends-all (with no files) that deps on all backends
  * sane-qcam is only available for x86/x86_64
  ** other archs does not implement inb/outb (at least in musl)

Now it is possible to use SANE with much less FS space (KB
instead of MB).

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
@luizluca
Copy link
Contributor Author

I just added a new patch in order to compile with uclibc. This allows sane-backend to be backported to CC or BB.

sbyx added a commit that referenced this pull request Oct 13, 2015
sane-backends: import from oldpackages (v2)
@sbyx sbyx merged commit ea9db94 into openwrt:master Oct 13, 2015
@luizluca luizluca deleted the sane branch December 22, 2015 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants