summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/olsrd/files/unbreak-makefile.patch45
-rw-r--r--packages/olsrd/olsrd.inc14
-rw-r--r--packages/olsrd/olsrd_0.5.3.bb14
-rw-r--r--packages/sane/.mtn2git_empty (renamed from packages/sane-backends/.mtn2git_empty)0
-rw-r--r--packages/sane/sane-backends-1.0.17/.mtn2git_empty (renamed from packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty)0
-rw-r--r--packages/sane/sane-backends-1.0.17/Makefile.in.patch (renamed from packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch)0
-rw-r--r--packages/sane/sane-backends-1.0.17/sane-plustek.patch (renamed from packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch)0
-rw-r--r--packages/sane/sane-backends-1.0.17/saned.xinetd (renamed from packages/sane-backends/sane-backends-1.0.17/saned.xinetd)0
-rw-r--r--packages/sane/sane-backends_1.0.17.bb (renamed from packages/sane-backends/sane-backends_1.0.17.bb)12
-rw-r--r--packages/sane/sane-frontends_1.0.13.bb20
10 files changed, 96 insertions, 9 deletions
diff --git a/packages/olsrd/files/unbreak-makefile.patch b/packages/olsrd/files/unbreak-makefile.patch
new file mode 100644
index 0000000000..cdf31df414
--- /dev/null
+++ b/packages/olsrd/files/unbreak-makefile.patch
@@ -0,0 +1,45 @@
+--- /tmp/Makefile 2007-08-26 13:59:42.264688053 +0200
++++ olsrd-0.5.3/Makefile 2007-08-26 14:02:46.059161904 +0200
+@@ -89,9 +89,8 @@
+ install: install_olsrd
+
+ install_bin:
+- mkdir -p $(SBINDIR)
+- install -m 755 $(EXENAME) $(SBINDIR)
+- $(STRIP) $(SBINDIR)/$(EXENAME)
++ mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
++ install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
+
+ install_olsrd: install_bin
+ @echo ========= C O N F I G U R A T I O N - F I L E ============
+@@ -100,16 +99,16 @@
+ @echo configfile can be installed. Note that a LQ-based configfile
+ @echo can be found at files/olsrd.conf.default.lq
+ @echo ==========================================================
+- mkdir -p $(ETCDIR)
++ mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
+ -cp -i files/olsrd.conf.default.rfc $(CFGFILE)
+ @echo -------------------------------------------
+ @echo Edit $(CFGFILE) before running olsrd!!
+ @echo -------------------------------------------
+ @echo Installing manpages olsrd\(8\) and olsrd.conf\(5\)
+- mkdir -p $(MANDIR)/man8/
+- cp files/olsrd.8.gz $(MANDIR)/man8/olsrd.8.gz
+- mkdir -p $(MANDIR)/man5/
+- cp files/olsrd.conf.5.gz $(MANDIR)/man5/olsrd.conf.5.gz
++ mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
++ cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/olsrd.8.gz
++ mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
++ cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/olsrd.conf.5.gz
+
+ tags:
+ $(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
+@@ -131,7 +130,7 @@
+ $(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
+
+ libs_install install_libs:
+- $(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
++ $(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
+
+ httpinfo:
+ $(MAKECMD) -C lib/httpinfo clean
diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
index 96341d9d88..990d8a1678 100644
--- a/packages/olsrd/olsrd.inc
+++ b/packages/olsrd/olsrd.inc
@@ -4,15 +4,11 @@ DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon - optional libraries"
SECTION = "console/network"
PRIORITY = "optional"
LICENSE = "BSD"
-RDEPENDS_olsrd = "olsrd-libs"
SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
file://init \
file://olsrd.conf"
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}"
-
S = "${WORKDIR}/olsrd-${PV}"
inherit update-rc.d
@@ -27,14 +23,20 @@ do_configure() {
}
do_compile() {
- oe_runmake
+ oe_runmake
}
do_install () {
- oe_runmake OS=linux INSTALL_PREFIX=${D} install install_libs
+ oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo install install_libs
install -d ${D}/${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
}
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}/*.so.*"
+
+RDEPENDS_${PN} = "olsrd-libs"
+
CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsrd/olsrd_0.5.3.bb
new file mode 100644
index 0000000000..5bc448a126
--- /dev/null
+++ b/packages/olsrd/olsrd_0.5.3.bb
@@ -0,0 +1,14 @@
+require olsrd.inc
+PR = "r0"
+
+SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \
+ file://init \
+ file://olsrd.conf \
+ file://unbreak-makefile.patch;patch=1"
+
+do_compile() {
+ oe_runmake OS=linux clean
+ touch .depend
+ touch src/cfgparser/.depend
+ oe_runmake OS=linux all libs
+}
diff --git a/packages/sane-backends/.mtn2git_empty b/packages/sane/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/sane-backends/.mtn2git_empty
+++ b/packages/sane/.mtn2git_empty
diff --git a/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/sane-backends/sane-backends-1.0.17/.mtn2git_empty
+++ b/packages/sane/sane-backends-1.0.17/.mtn2git_empty
diff --git a/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch
index d73a2f0fb5..d73a2f0fb5 100644
--- a/packages/sane-backends/sane-backends-1.0.17/Makefile.in.patch
+++ b/packages/sane/sane-backends-1.0.17/Makefile.in.patch
diff --git a/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch
index f6920c6e22..f6920c6e22 100644
--- a/packages/sane-backends/sane-backends-1.0.17/sane-plustek.patch
+++ b/packages/sane/sane-backends-1.0.17/sane-plustek.patch
diff --git a/packages/sane-backends/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd
index f4e890fdbe..f4e890fdbe 100644
--- a/packages/sane-backends/sane-backends-1.0.17/saned.xinetd
+++ b/packages/sane/sane-backends-1.0.17/saned.xinetd
diff --git a/packages/sane-backends/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb
index b4ef25486a..4854f4d10c 100644
--- a/packages/sane-backends/sane-backends_1.0.17.bb
+++ b/packages/sane/sane-backends_1.0.17.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Scanner drivers for SANE"
DEPENDS = "gphoto2 jpeg libusb"
LICENSE = "LGPL"
-PR = "r0"
+PR = "r2"
SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \
file://Makefile.in.patch;patch=1 \
file://saned.xinetd \
"
-inherit autotools
+inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--disable-translations"
@@ -26,7 +26,7 @@ RRECOMMENDS_libsane = "saned sane-utils"
FILES_libsane-dev += "${libdir}/sane/*"
RRECOMMENDS_saned = "xinetd"
-FILES_saned = "i${sbindir}/saned"
+FILES_saned = "${sbindir}/saned"
FILES_sane-utils = "${bindir}/*"
FILES_${PN}-dbg += "${libdir}/sane/.debug"
@@ -34,3 +34,9 @@ FILES_${PN}-dbg += "${libdir}/sane/.debug"
CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf"
+do_stage() {
+ autotools_stage_all
+}
+
+
+
diff --git a/packages/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb
new file mode 100644
index 0000000000..f79cf9e508
--- /dev/null
+++ b/packages/sane/sane-frontends_1.0.13.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Frontends for SANE"
+DEPENDS = "virtual/libx11 gimp sane-backends"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \
+ "
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-translations"
+
+PACKAGES =+ "scanadf xcam xscanimage"
+
+FILES_scanadf = "${bindir}/scanadf"
+FILES_xcam = "${bindir}/xcam"
+FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane"
+
+