diff options
Diffstat (limited to 'packages')
66 files changed, 631 insertions, 82 deletions
diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 0da364071b..fbf1442771 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -25,7 +25,8 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES_DYNAMIC = "libasound*" FILES_libasound = "${libdir}/libasound.so*" FILES_alsa-server = "${bindir}" FILES_alsa-conf = "${datadir}" diff --git a/packages/angstrom/task-angstrom.bb b/packages/angstrom/task-angstrom.bb index 059e856028..c8c84c3e5e 100644 --- a/packages/angstrom/task-angstrom.bb +++ b/packages/angstrom/task-angstrom.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r16" +PR = "r17" ALLOW_EMPTY = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -35,6 +35,7 @@ RDEPENDS_angstrom-base-depends = "\ ipkg ipkg-collateral \ wireless-tools \ tslib-tests tslib-calibrate \ + util-linux-mount util-linux-umount \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ ${PCMCIA_MANAGER} \ diff --git a/packages/aspell/aspell5-en_6.0-0.bb b/packages/aspell/aspell5-en_6.0-0.bb index 8364df06a9..568e692ab9 100644 --- a/packages/aspell/aspell5-en_6.0-0.bb +++ b/packages/aspell/aspell5-en_6.0-0.bb @@ -1,4 +1,14 @@ +LICENSE = "Copyright file" SRC_URI = "ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell5-en-${PV}.tar.bz2" +PR="r1" require aspell-lang.inc +FILES_${PN} += "${docdir}/Copyright" +FILES_${PN}-doc = "" + +do_install_append() { + install -d ${D}${docdir} + install ${S}/Copyright ${D}${docdir} +} + diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index 46f24c0e35..00da4ab33f 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r5" +PR = "r6" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ @@ -15,8 +15,8 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR}" export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" export CROSS_ARCH="Linux" -export CROSS_PROC="arm" -export SUB_PROC="xscale" + +export CROSS_PROC="${TARGET_ARCH}" export MAKECMDGOALS="dont-optimize" diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 4b1f8f68e8..ea771a334b 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -7,6 +7,7 @@ OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" +PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*" PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 9d44190365..0e02aff176 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -199,12 +199,7 @@ python package_do_split_gconvs () { if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='', aux_files_pattern_verbatim=binary_locales_dir + '/%s') - else: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') - bb.note("generation of binary locales disabled. this may break i18n!") + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") @@ -243,8 +238,12 @@ python package_do_split_gconvs () { target_arch = bb.data.getVar("TARGET_ARCH", d, 1) qemu = "qemu-%s" % target_arch pkgname = 'locale-base-' + legitimize_package_name(name) - - bb.data.setVar('RDEPENDS_%s' % pkgname, 'glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + m = re.match("(.*)\.(.*)", name) + if m: + glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + glibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, 'glibc-binary-localedata-%s' % glibc_name, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: @@ -257,7 +256,7 @@ python package_do_split_gconvs () { path = bb.data.getVar("PATH", d, 1) i18npath = os.path.join(treedir, datadir, "i18n") - localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, locale) + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): @@ -276,20 +275,33 @@ python package_do_split_gconvs () { bb.build.exec_func("do_prep_locale_tree", d) # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] for l in encodings.keys(): if len(encodings[l]) == 1: output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) else: if "UTF-8" in encodings[l]: output_locale(l, l, "UTF-8") encodings[l].remove("UTF-8") + else: + non_utf8.append(l) for e in encodings[l]: - output_locale('%s-%s' % (l, e), l, e) + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) if use_bin: bb.note("collecting binary locales from locale tree") bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + } # We want to do this indirection so that we can safely 'return' diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index b42a85ef02..fd9a356436 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index d6a8c6a276..7e064ed444 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r20" +PR = "r21" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 288251191f..855560adf3 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 78b190d16d..05a86fd7ab 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r6" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index ce60ba1c01..3fe3bdbecc 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r6" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index a3bf9bc5fa..d00c31a723 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r3" +PR = "r4" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 158fcaea83..7ade9573b2 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 0702500204..9244c3584a 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r10" +PR = "r11" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 2d37ba93fb..f138a9b807 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" DEFAULT_PREFERENCE = "-1" -PR = "r8" +PR = "r9" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c3c9fb0781..2f018ab21f 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r3" +PR = "r4" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 9ee030d5c9..33a4f16d06 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -7,9 +7,10 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "libsoup-2.2*" FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}" -FILES_${PN}-doc = "${datadir}" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" do_stage() { autotools_stage_all diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb index 3c48bc95ff..7a934a8131 100644 --- a/packages/gnutls/gnutls_1.4.0.bb +++ b/packages/gnutls/gnutls_1.4.0.bb @@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ inherit autotools binconfig PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" +PACKAGES_DYNAMIC = "libgnutls*" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" FILES_${PN} = "${libdir}/libgnutls.so.*" diff --git a/packages/gpe-conf/gpe-conf_0.2.2.bb b/packages/gpe-conf/gpe-conf_0.2.2.bb new file mode 100644 index 0000000000..9cb5b6b059 --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.2.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +SECTION = "gpe" +PRIORITY = "optional" + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +PR="r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" + +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" + + diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb index 817d179f9f..d2c3cd52e7 100644 --- a/packages/gtk+/gtk+_2.8.9.bb +++ b/packages/gtk+/gtk+_2.8.9.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org" SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ @@ -35,8 +35,8 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource" RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1" -RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" +RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration" # --disable-cruft diff --git a/packages/ipaq-sleep/files/install-fix.patch b/packages/ipaq-sleep/files/install-fix.patch new file mode 100644 index 0000000000..59eb17b071 --- /dev/null +++ b/packages/ipaq-sleep/files/install-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2006-08-12 12:16:47.000000000 +0200 ++++ ipaq-sleep-0.9/Makefile 2006-08-12 12:22:42.188306000 +0200 +@@ -24,7 +24,7 @@ + $(CC) -o $(PACKAGE) $(PACKAGE).o $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all +- install -Ds $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install -D -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)/etc/init.d + install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) + install $(PACKAGE).conf $(DESTDIR)/etc/$(PACKAGE).conf diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index ba9eb14bc7..2855dcd965 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -7,6 +7,7 @@ SECTION = "x11/base" RDEPENDS = "apm" SRC_URI_append = " file://init-script-busybox.patch;patch=1" +SRC_URI_append = " file://install-fix.patch;patch=1" PR = "r1" diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb index 79a7021b5a..2cd5c92e25 100644 --- a/packages/iputils/iputils_20020927.bb +++ b/packages/iputils/iputils_20020927.bb @@ -4,7 +4,7 @@ tracepath, tracepath6, ping, ping6 and arping." SECTION = "console/network" MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" LICENSE ="BSD" -PR = "r3" +PR = "r4" SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz \ file://debian-fixes.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss0 file://glibc-2.4-compat.patch;patch=1" S = "${WORKDIR}/iputils" -PACKAGES = "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6 ${PN}-doc" +PACKAGES += "${PN}-ping ${PN}-ping6 ${PN}-arping ${PN}-tracepath ${PN}-tracepath6 ${PN}-traceroute6" FILES_${PN} = "" FILES_${PN}-ping = "${base_bindir}/ping.${PN}" FILES_${PN}-ping6 = "${base_bindir}/ping6.${PN}" @@ -35,9 +35,9 @@ do_compile () { do_install () { install -m 0755 -d ${D}${base_bindir} ${D}${bindir} ${D}${mandir}/man8 # SUID root programs - install -m 4755 ping ${D}${base_bindir}/ping.${PN} - install -m 4755 ping6 ${D}${base_bindir}/ping6.${PN} - install -m 4755 traceroute6 ${D}${bindir}/ + install -m 4555 ping ${D}${base_bindir}/ping.${PN} + install -m 4555 ping6 ${D}${base_bindir}/ping6.${PN} + install -m 4555 traceroute6 ${D}${bindir}/ # Other programgs for i in arping tracepath tracepath6; do install -m 0755 $i ${D}${bindir}/ @@ -49,7 +49,9 @@ do_install () { } # Busybox also provides ping and ping6, so use update-alternatives +# Also fixup SUID bit for applications that need it pkg_postinst_${PN}-ping () { + chmod 4555 ${base_bindir}/ping.${PN} update-alternatives --install ${base_bindir}/ping ping ping.${PN} 100 } pkg_prerm_${PN}-ping () { @@ -57,8 +59,13 @@ pkg_prerm_${PN}-ping () { } pkg_postinst_${PN}-ping6 () { + chmod 4555 ${base_bindir}/ping6.${PN} update-alternatives --install ${base_bindir}/ping6 ping6 ping6.${PN} 100 } pkg_prerm_${PN}-ping6 () { update-alternatives --remove ping6 ping6.${PN} } + +pkg_postinst_${PN}-traceroute6 () { + chmod 4555 ${bindir}/traceroute6 +} diff --git a/packages/libchm/.mtn2git_empty b/packages/libchm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/.mtn2git_empty diff --git a/packages/libchm/chmlib_0.38.bb b/packages/libchm/chmlib_0.38.bb new file mode 100644 index 0000000000..4b44b7ce57 --- /dev/null +++ b/packages/libchm/chmlib_0.38.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files." +LICENSE = "GPLv2" +HOMEPAGE = "http://66.93.236.84/~jedwin/projects/chmlib/" + +SRC_URI = "http://66.93.236.84/~jedwin/projects/chmlib/${P}.tar.bz2 \ + file://arm-guess.patch;patch=1" + +inherit autotools pkgconfig + + + diff --git a/packages/libchm/files/.mtn2git_empty b/packages/libchm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libchm/files/.mtn2git_empty diff --git a/packages/libchm/files/arm-guess.patch b/packages/libchm/files/arm-guess.patch new file mode 100644 index 0000000000..b524c81aac --- /dev/null +++ b/packages/libchm/files/arm-guess.patch @@ -0,0 +1,12 @@ +--- /tmp/chm_lib.c 2006-08-13 12:29:15.000000000 +0200 ++++ chmlib-0.38/src/chm_lib.c 2006-08-13 12:29:43.148306000 +0200 +@@ -160,7 +160,8 @@ + /* Sparc */ + /* MIPS */ + /* PPC */ +-#elif __i386__ || __sun || __sgi || __ppc__ ++/* ARM */ ++#elif __i386__ || __sun || __sgi || __ppc__ || __arm__ + typedef unsigned char UChar; + typedef short Int16; + typedef unsigned short UInt16; diff --git a/packages/libmimedir/files/gslist-fix.patch b/packages/libmimedir/files/gslist-fix.patch new file mode 100644 index 0000000000..ef28ecdc53 --- /dev/null +++ b/packages/libmimedir/files/gslist-fix.patch @@ -0,0 +1,11 @@ +--- /tmp/mimedir-attribute.c 2006-08-12 19:55:04.000000000 +0200 ++++ libmimedir/mimedir/mimedir-attribute.c 2006-08-12 19:55:49.938306000 +0200 +@@ -1768,7 +1768,7 @@ + } + break; + case ',': +- g_slist_append (list, g_string_free (string, FALSE)); ++ list = g_slist_append (list, g_string_free (string, FALSE)); + string = g_string_new (""); + break; + case '\r': diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index 14c1209b2e..f3adcc22f4 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -3,14 +3,15 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r0" +PR = "r2" DEFAULT_PREFERENCE = "5" SRCDATE = "20060804" PV = "0.4.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ file://mimedir-update.patch;patch=1 \ - file://mimedir-write-sequence.patch;patch=1;pnum=0" + file://mimedir-write-sequence.patch;patch=1;pnum=0 \ + file://gslist-fix.patch;patch=1" S = "${WORKDIR}/libmimedir" @@ -22,6 +23,6 @@ do_stage() { autotools_stage_all } -PACKAGES += libmimedir-utils -FILES_libmimedir-utils = "${bindir}" -FILES_${PN} = "${libdir}" +PACKAGES =+ libmimedir-utils +PACKAGES_DYNAMIC = "libmimedir-0.4*" +FILES_libmimedir-utils = "${bindir}/" diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig index 0034b9142c..82f309c895 100644 --- a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig +++ b/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-hh5 -# Thu Aug 10 14:18:29 2006 +# Sat Aug 12 10:50:22 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -191,13 +191,13 @@ CONFIG_IPAQ_HANDHELD=y # Compaq/HP iPAQ Drivers # CONFIG_IPAQ_CLOCKS=y -CONFIG_IPAQ_SLEEVE=m +CONFIG_IPAQ_SLEEVE=y CONFIG_IPAQ_SAMCOP=y # CONFIG_IPAQ_HAMCOP is not set CONFIG_IPAQ_SAMCOP_TOUCHSCREEN=y # CONFIG_IPAQ_SAMCOP_FSI is not set # CONFIG_IPAQ_SAMCOP_SLEEVE is not set -# CONFIG_IPAQ_SAMCOP_DMA is not set +CONFIG_IPAQ_SAMCOP_DMA=y CONFIG_DMABOUNCE=y # diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index bdc2f86633..41cab94908 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -4,7 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3600|simpad)' +COMPATIBLE_MACHINE = '(h3600|simpad|jornada56x)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" diff --git a/packages/madwifi/files/10-xscale-be-elf-copts.patch b/packages/madwifi/files/10-xscale-be-elf-copts.patch index e3158c045c..84915e03e2 100644 --- a/packages/madwifi/files/10-xscale-be-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-be-elf-copts.patch @@ -1,8 +1,10 @@ --- madwifi-ng/hal/public/xscale-be-elf.inc~ 2006-02-11 22:34:39.000000000 +1030 +++ madwifi-ng/hal/public/xscale-be-elf.inc 2006-04-12 06:10:47.736463272 +0930 -@@ -73,4 +73,4 @@ +@@ -77,5 +77,5 @@ + LDOPTS= -EB - COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC - COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ + COPTS+= -DAH_BYTE_ORDER=AH_BIG_ENDIAN +-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ - -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common \ ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/files/10-xscale-le-elf-copts.patch b/packages/madwifi/files/10-xscale-le-elf-copts.patch index 393167c165..7ab46e16b3 100644 --- a/packages/madwifi/files/10-xscale-le-elf-copts.patch +++ b/packages/madwifi/files/10-xscale-le-elf-copts.patch @@ -1,8 +1,8 @@ --- madwifi-ng/hal/public/xscale-le-elf.inc~ 2006-04-12 06:09:56.669226672 +0930 +++ madwifi-ng/hal/public/xscale-le-elf.inc 2006-04-12 05:52:11.658132968 +0930 -@@ -74,4 +74,4 @@ +@@ -79,4 +79,4 @@ LDOPTS= -EL - COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN -DAH_REGOPS_FUNC + COPTS+= -DAH_BYTE_ORDER=AH_LITTLE_ENDIAN COPTS+= -march=armv4 -mlittle-endian -fno-strict-aliasing -fno-common \ - -mapcs-32 -mtune=xscale -mshort-load-bytes -msoft-float -mfp=2 -+ -mapcs-32 -mtune=xscale -malignment-traps -msoft-float -mfp=2 ++ -mtune=xscale -msoft-float -mfp=2 diff --git a/packages/madwifi/madwifi-ng_r1692-20060723.bb b/packages/madwifi/madwifi-ng_r1692-20060723.bb index 84af37257d..6268f2b78f 100644 --- a/packages/madwifi/madwifi-ng_r1692-20060723.bb +++ b/packages/madwifi/madwifi-ng_r1692-20060723.bb @@ -1,2 +1,2 @@ require madwifi-ng_r.inc -PR="r0" +PR="r1" diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb index fa4b318956..c2e0e829ce 100644 --- a/packages/man/man_1.5p.bb +++ b/packages/man/man_1.5p.bb @@ -4,7 +4,7 @@ MAINTAINER = "Inge Arnesen <inge.arnesen@gmail.com>" DESCRIPTION = "The man page suite, including man, apropos, \ and whatis consists of programs that are used to read most \ of the documentation available on a Linux system." -PR = "r2" +PR = "r3" RDEPENDS_${PN} = "less groff" # Note: The default man.conf uses wrong names for GNU eqn and troff, @@ -37,6 +37,6 @@ do_install() { install -m 644 ${FILESDIR}/man.conf ${D}/etc } -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \ ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin /sbin /lib/*/ /lib/*.so*" diff --git a/packages/mikmod/mikmod_3.2.2-beta1.bb b/packages/mikmod/mikmod_3.2.2-beta1.bb index 79146fb580..76acab9f64 100644 --- a/packages/mikmod/mikmod_3.2.2-beta1.bb +++ b/packages/mikmod/mikmod_3.2.2-beta1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod." SECTION = "console/multimedia" HOMEPAGE = "http://mikmod.raphnet.net" MAINTAINER = "Michael 'Mickey' Lauer" -DEPENDS = "libmikmod" +DEPENDS = "ncurses libmikmod" PR = "r1" LICENSE = "GPL" SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \ diff --git a/packages/nautilus/nautilus_2.12.2.bb b/packages/nautilus/nautilus_2.12.2.bb index 6828c78c79..2f5628073e 100644 --- a/packages/nautilus/nautilus_2.12.2.bb +++ b/packages/nautilus/nautilus_2.12.2.bb @@ -5,7 +5,7 @@ inherit gnome LICENSE="GPL" -DEPENDS="librsvg eel esound gnome-desktop" +DEPENDS="librsvg libexif eel esound gnome-desktop" EXTRA_OECONF = "--disable-gtk-doc" diff --git a/packages/ndisc6/.mtn2git_empty b/packages/ndisc6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ndisc6/.mtn2git_empty diff --git a/packages/ndisc6/files/.mtn2git_empty b/packages/ndisc6/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/ndisc6/files/.mtn2git_empty diff --git a/packages/ndisc6/files/acinclude.m4 b/packages/ndisc6/files/acinclude.m4 new file mode 100644 index 0000000000..5360fff5d2 --- /dev/null +++ b/packages/ndisc6/files/acinclude.m4 @@ -0,0 +1,197 @@ +# _AC_C_STD_TRY(STANDARD, TEST-PROLOGUE, TEST-BODY, OPTION-LIST, +# ACTION-IF-AVAILABLE, ACTION-IF-UNAVAILABLE) +# -------------------------------------------------------------- +# Check whether the C compiler accepts features of STANDARD (e.g `c89', `c99') +# by trying to compile a program of TEST-PROLOGUE and TEST-BODY. If this fails, +# try again with each compiler option in the space-separated OPTION-LIST; if one +# helps, append it to CC. If eventually successful, run ACTION-IF-AVAILABLE, +# else ACTION-IF-UNAVAILABLE. +AC_DEFUN([_AC_C_STD_TRY], +[AC_MSG_CHECKING([for $CC option to accept ISO ]m4_translit($1, [c], [C])) +AC_CACHE_VAL(ac_cv_prog_cc_$1, +[ac_cv_prog_cc_$1=no +ac_save_CC=$CC +AC_LANG_CONFTEST([AC_LANG_PROGRAM([$2], [$3])]) +for ac_arg in '' $4 +do + CC="$ac_save_CC $ac_arg" + _AC_COMPILE_IFELSE([], [ac_cv_prog_cc_$1=$ac_arg]) + test "x$ac_cv_prog_cc_$1" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +])# AC_CACHE_VAL +case "x$ac_cv_prog_cc_$1" in + x) + AC_MSG_RESULT([none needed]) ;; + xno) + AC_MSG_RESULT([unsupported]) ;; + *) + CC="$CC $ac_cv_prog_cc_$1" + AC_MSG_RESULT([$ac_cv_prog_cc_$1]) ;; +esac +AS_IF([test "x$ac_cv_prog_cc_$1" != xno], [$5], [$6]) +])# _AC_C_STD_TRY + +# _AC_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C99 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C99 on some system or another. It +# considers the compiler to be in ISO C99 mode if it handles mixed +# code and declarations, _Bool, inline and restrict. +AC_DEFUN([_AC_PROG_CC_C99], +[_AC_C_STD_TRY([c99], +[[#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict(ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy work. +static void +test_varargs(const char *format, ...) +{ + va_list args; + va_start(args, format); + va_list args_copy; + va_copy(args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg(args_copy, const char *); + break; + case 'd': // int + number = va_arg(args_copy, int); + break; + case 'f': // float + fnumber = (float) va_arg(args_copy, double); + break; + default: + break; + } + } + va_end(args_copy); + va_end(args); +} +]], +[[ + // Check bool and long long datatypes. + _Bool success = false; + long long int bignum = -1234567890LL; + unsigned long long int ubignum = 1234567890uLL; + + // Check restrict. + if (test_restrict("String literal") != 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs("s, d' f .", "string", 65, 34.234); + + // Check incomplete arrays work. + struct incomplete_array *ia = + malloc(sizeof(struct incomplete_array) + (sizeof(double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = (double) i * 1.234; + + // Check named initialisers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[43] = 543; + + // work around unused variable warnings + return bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'; +]], +dnl Try +dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) +dnl AIX -qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99) +dnl Intel ICC -c99 +dnl IRIX -c99 +dnl Solaris (unused because it causes the compiler to assume C99 semantics for +dnl library functions, and this is invalid before Solaris 10: -xc99) +dnl Tru64 -c99 +dnl with extended modes being tried first. +[[-std=gnu99 -c99 -qlanglvl=extc99]], [$1], [$2])[]dnl +])# _AC_PROG_CC_C99 + +# AC_PROG_CC_C99 +# -------------- +AC_DEFUN([AC_PROG_CC_C99], +[ AC_REQUIRE([AC_PROG_CC])dnl + _AC_PROG_CC_C99 +]) + +# AC_USE_SYSTEM_EXTENSIONS +# ------------------------ +# Enable extensions on systems that normally disable them, +# typically due to standards-conformance issues. +AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], +[ + AC_BEFORE([$0], [AC_COMPILE_IFELSE]) + AC_BEFORE([$0], [AC_RUN_IFELSE]) + + AC_REQUIRE([AC_GNU_SOURCE]) + AC_REQUIRE([AC_AIX]) + AC_REQUIRE([AC_MINIX]) + + AH_VERBATIM([__EXTENSIONS__], +[/* Enable extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif]) + AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], + [ac_cv_safe_to_define___extensions__], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ +# define __EXTENSIONS__ 1 + AC_INCLUDES_DEFAULT])], + [ac_cv_safe_to_define___extensions__=yes], + [ac_cv_safe_to_define___extensions__=no])]) + test $ac_cv_safe_to_define___extensions__ = yes && + AC_DEFINE([__EXTENSIONS__]) + AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) +]) diff --git a/packages/ndisc6/files/autoconf-older-version.patch b/packages/ndisc6/files/autoconf-older-version.patch new file mode 100644 index 0000000000..0ab0fd13bb --- /dev/null +++ b/packages/ndisc6/files/autoconf-older-version.patch @@ -0,0 +1,14 @@ +Patch the required version back to 2.59 +We'll include the missing macros via acinclude.m4 + +--- ndisc6-0.6.7/configure.ac~ 2006-08-14 16:46:06.000000000 +1000 ++++ ndisc6-0.6.7/configure.ac 2006-08-14 16:46:06.000000000 +1000 +@@ -21,7 +21,7 @@ + + AC_COPYRIGHT([Copyright (C) 2005-2006 Remi Denis-Courmont]) + AC_INIT(ndisc6, 0.6.7, rdenis@simphalempin.com) +-AC_PREREQ(2.59c) ++AC_PREREQ(2.59) + INVOCATION="$0 $*" + + AS_MESSAGE(checking system...) diff --git a/packages/ndisc6/ndisc6_0.6.7.bb b/packages/ndisc6/ndisc6_0.6.7.bb new file mode 100644 index 0000000000..a9e2118b39 --- /dev/null +++ b/packages/ndisc6/ndisc6_0.6.7.bb @@ -0,0 +1,62 @@ +SECTION = "console/network" +DESCRIPTION = "This package includes some useful diagnostics tools for \ +IPv6 networks, including ndisc6, rdisc6, tcptraceroute6 and traceroute6." +SECTION = "console/network" +MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>" +HOMEPAGE = "http://www.simphalempin.com/dev/ndisc6/" +LICENSE = "GPL" +PR = "r0" + +# The tcptraceroute6 and tracert6 commands depend on rltraceroute6 to +# perform the actual trace operation. +RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" +RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" + +SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ + file://autoconf-older-version.patch;patch=1 \ + file://acinclude.m4" + +inherit autotools + +# Split into seperate packages since we normal don't want them all +# The main package is left empty and therefore not created. +PACKAGES += "${PN}-ndisc6 ${PN}-tcpspray6 ${PN}-rdisc6 \ + ${PN}-tcptraceroute6 ${PN}-rltraceroute6 ${PN}-tracert6" +FILES_${PN} = "" +FILES_${PN}-ndisc6 = "${bindir}/ndisc6" +FILES_${PN}-tcpspray6 = "${bindir}/tcpspray6" +FILES_${PN}-rdisc6 = "${bindir}/rdisc6" +FILES_${PN}-tcptraceroute6 = "${bindir}/tcptraceroute6" +FILES_${PN}-rltraceroute6 = "${bindir}/rltraceroute6" +FILES_${PN}-tracert6 = "${bindir}/tracert6" + +DESCRIPTION_${PN}-ndisc6 = "ICMPv6 Neighbor Discovery tool. \ +Performs IPv6 neighbor discovery in userland. Replaces arping from the \ +IPv4 world." +DESCRIPTION_${PN}-rdisc6 = "ICMPv6 Router Discovery tool. \ +Queries IPv6 routers on the network for advertised prefixes. Can be used \ +to detect rogue IPv6 routers, monitor legitimate IPv6 routers." +DESCRITPION_${PN}-tcpspray6 = "Performs bandwidth measurements of TCP \ +sessions between the local system and a remote echo server in either IPv6 \ +or IPv4." + + + +# Add some macros from the autoconf 2.60 which to let us build with +# autoconf 2.59. This can be removed when/if we update to autoconf +# 2.60 +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S} +} + + +# Enable SUID bit for applications that need it +pkg_postinst_${PN}-rltraceroute6 () { + chmod 4555 ${bindir}/rltraceroute6 +} +pkg_postinst_${PN}-ndisc6 () { + chmod 4555 ${bindir}/ndisc6 +} +pkg_postinst_${PN}-rdisc6 () { + chmod 4555 ${bindir}/rdisc6 +} diff --git a/packages/ntp/ntp_4.2.0.bb b/packages/ntp/ntp_4.2.0.bb index d6d103f542..cc3ecb89dc 100644 --- a/packages/ntp/ntp_4.2.0.bb +++ b/packages/ntp/ntp_4.2.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://ntp.isc.org/bin/view/Main/WebHome" SECTION = "console/network" PRIORITY = "optional" LICENSE = "ntp" -PR = "r7" +PR = "r8" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://ntpdc.Makefile.am.maybe-layout.patch;patch=1 \ @@ -28,7 +28,7 @@ inherit autotools update-rc.d EXTRA_OECONF = "--without-openssl --without-crypto ac_cv_header_readline_history_h=no" CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -PACKAGES = "ntpdate ntp-bin ntp ntp-tickadj" +PACKAGES += "ntpdate ntp-bin ntp ntp-tickadj" # NOTE: you don't need ntpdate, use "ntpdc -q -g -x" PROVIDES = "ntpdate-${PV} ntpdate-${PV}-${PR} ntpdate" diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index 451d44b17c..7603e11537 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r5" +PR = "r6" LICENSE = "BSD" SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" @@ -38,4 +38,4 @@ do_stage () { } FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-dev += "${bindir}" +FILES_${PN}-dev += "${bindir}/*" diff --git a/packages/sqlite/sqlite3_3.2.2.bb b/packages/sqlite/sqlite3_3.2.2.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.2.bb +++ b/packages/sqlite/sqlite3_3.2.2.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.5.bb b/packages/sqlite/sqlite3_3.2.5.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.5.bb +++ b/packages/sqlite/sqlite3_3.2.5.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/sqlite/sqlite3_3.2.7.bb b/packages/sqlite/sqlite3_3.2.7.bb index e393c0963a..d21fb6ad3e 100644 --- a/packages/sqlite/sqlite3_3.2.7.bb +++ b/packages/sqlite/sqlite3_3.2.7.bb @@ -1,2 +1,2 @@ -include sqlite3.inc +require sqlite3.inc PR = "r2" diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index d35f07f30a..8514ceb717 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -30,7 +30,7 @@ RDEPENDS_task-sdk-base := "\ freetype-dev \ glib-2.0-dev \ gstreamer-dev \ - ice-dev \ + libice-dev \ ipkg-dev \ jpeg-dev \ libapm-dev \ @@ -43,7 +43,7 @@ RDEPENDS_task-sdk-base := "\ libgpg-error-dev \ libidl-dev \ libiw-dev \ - libmimedir-3.3-dev \ + libmimedir-0.4-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ @@ -61,7 +61,7 @@ RDEPENDS_task-sdk-base := "\ readline-dev \ sqlite-dev \ zlib-dev \ - xmu-dev" + libxmu-dev" RDEPENDS_task-sdk-x11 := "\ atk-dev \ diff --git a/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch new file mode 100644 index 0000000000..c4b699f263 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.28/dl-startup.h.patch @@ -0,0 +1,22 @@ +--- uClibc-0.9.28/ldso/ldso/arm/dl-startup.h- 2006-08-13 18:56:40.000000000 +0200 ++++ uClibc-0.9.28/ldso/ldso/arm/dl-startup.h 2006-08-13 18:56:58.000000000 +0200 +@@ -4,8 +4,8 @@ + * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org> + */ + +-#if defined(__arm__) +-asm( ++#if !defined(__thumb__) ++__asm__( + " .text\n" + " .globl _start\n" + " .type _start,%function\n" +@@ -57,7 +57,7 @@ + ".previous\n" + ); + #else +-asm( ++__asm__( + " .text\n" + " .arm\n" + " .globl _start\n" diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 6f5d81c9e5..a5d4095a64 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r3" +PR = "r4" require uclibc.inc @@ -30,6 +30,7 @@ SRC_URI += " file://thumb-swi-r7.patch;patch=1" SRC_URI += " file://thumb-sysnum-h.patch;patch=1" SRC_URI += " file://thumb-asm-swi.patch;patch=1" SRC_URI += " file://thumb-call-via-rx.patch;patch=1" +SRC_URI += " file://dl-startup.h.patch;patch=1" # # This is a core change and is controversial, maybe even wrong # on some architectures diff --git a/packages/udev/files/h2200/.mtn2git_empty b/packages/udev/files/h2200/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/files/h2200/.mtn2git_empty diff --git a/packages/udev/files/h2200/mount.blacklist b/packages/udev/files/h2200/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/h2200/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram
\ No newline at end of file diff --git a/packages/udev/files/ipaq-pxa270/.mtn2git_empty b/packages/udev/files/ipaq-pxa270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/udev/files/ipaq-pxa270/.mtn2git_empty diff --git a/packages/udev/files/ipaq-pxa270/mount.blacklist b/packages/udev/files/ipaq-pxa270/mount.blacklist new file mode 100644 index 0000000000..7e351bc988 --- /dev/null +++ b/packages/udev/files/ipaq-pxa270/mount.blacklist @@ -0,0 +1,6 @@ +# This is a grep pattern matched against the device name +# Any matched pattern will _not_ be mounted / removed by udevd + +/dev/mtdblock +/dev/loop +/dev/ram
\ No newline at end of file diff --git a/packages/udev/udev-092/50-hostap_cs.rules b/packages/udev/udev-092/50-hostap_cs.rules new file mode 100644 index 0000000000..efefdc58fc --- /dev/null +++ b/packages/udev/udev-092/50-hostap_cs.rules @@ -0,0 +1,4 @@ +# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards +# +ACTION=="add", DEVICE=="hostap_cs", \ + SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1" diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb index 6a650b5f09..07b5eaa12f 100644 --- a/packages/udev/udev_092.bb +++ b/packages/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES = "hotplug" -PR = "r9" +PR = "r10" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -11,7 +11,11 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ file://arm_inotify_fix.patch;patch=1 \ - file://mount.blacklist" + file://mount.blacklist \ + " + +SRC_URI_append_h2200 = " file://50-hostap_cs.rules " +PACKAGE_ARCH_h2200 = "h2200" require udev.inc @@ -49,3 +53,7 @@ do_install () { install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } + +do_install_append_h2200() { + install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules +} diff --git a/packages/xmms/files/acinclude.m4 b/packages/xmms/files/acinclude.m4 new file mode 100644 index 0000000000..099d55b0b2 --- /dev/null +++ b/packages/xmms/files/acinclude.m4 @@ -0,0 +1,36 @@ +dnl XMMS_FUNC_POSIX(FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl Test for functions in posix libraries, and define POSIX_LIBS +AC_DEFUN(XMMS_FUNC_POSIX, +[dnl + xmms_posix4=no + xmms_rt=no + for xmms_func in $1 + do + xmms_have_func=no + AC_CHECK_FUNC($xmms_func,xmms_have_func=yes,[ + dnl try in libposix4 if not found in current LIBS + AC_CHECK_LIB(posix4,$xmms_func,[xmms_have_func=yes xmms_posix4=yes],[ + dnl try in librt, if not found so far + AC_CHECK_LIB(rt,$xmms_func,[xmms_have_func=yes xmms_rt=yes]) + ]) + ]) + if test $xmms_have_func = yes; then + changequote(, )dnl + xmms_tr_func=HAVE_`echo $xmms_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + changequote([, ])dnl + AC_DEFINE_UNQUOTED($xmms_tr_func) + ifelse([$2], , :, [$2]) + else + ifelse([$3], , :, [$3]) + fi + done + POSIX_LIBS= + if test $xmms_posix4 = yes; then + POSIX_LIBS=-lposix4 + fi + if test $xmms_rt = yes; then + POSIX_LIBS="$POSIX_LIBS -lrt" + fi + AC_SUBST(POSIX_LIBS) +]) + diff --git a/packages/xmms/files/xmms-config-dequote.patch b/packages/xmms/files/xmms-config-dequote.patch new file mode 100644 index 0000000000..8fdd7f0cf7 --- /dev/null +++ b/packages/xmms/files/xmms-config-dequote.patch @@ -0,0 +1,25 @@ +--- xmms-1.2.10/xmms-config.in.orig 2006-08-13 06:55:56.000000000 +0100 ++++ xmms-1.2.10/xmms-config.in 2006-08-13 06:56:52.000000000 +0100 +@@ -12,15 +12,15 @@ + # + # This work is released under the GNU GPL, version 2 or later. + +-prefix="@prefix@" +-exec_prefix="@exec_prefix@" ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ + exec_prefix_set=no +-data_dir="@datadir@/@PACKAGE@" ++data_dir=@datadir@/@PACKAGE@ + +-version="@VERSION@" +-include_dir="@includedir@" +-xmms_include_dir="@includedir@/@PACKAGE@" +-lib_dir="@libdir@" ++version=@VERSION@ ++include_dir=@includedir@ ++xmms_include_dir=@includedir@/@PACKAGE@ ++lib_dir=@libdir@ + + if ( (gtk-config --version) > /dev/null 2>&1) then + gtk_libs=`gtk-config --libs` diff --git a/packages/xmms/files/xmms.sh b/packages/xmms/files/xmms.sh new file mode 100644 index 0000000000..7d1a96e129 --- /dev/null +++ b/packages/xmms/files/xmms.sh @@ -0,0 +1,4 @@ +#! /bin/sh + +XLIB_SKIP_ARGB_VISUALS=1 xmms + diff --git a/packages/xmms/xmms-mad_0.10.bb b/packages/xmms/xmms-mad_0.10.bb new file mode 100644 index 0000000000..6c43d7878f --- /dev/null +++ b/packages/xmms/xmms-mad_0.10.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "xmms plugin for the mad integer mp3 decoder" +SECTION = "x11/multimedia" +HOMEPAGE = "http://xmms-mad.sourceforge.net +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms libmad libid3tag" +SRC_URI = "${SOURCEFORGE_MIRROR}/xmms-mad/xmms-mad-${PV}.tar.bz2" + +inherit autotools + +export XMMS_CONFIG = "${STAGING_BINDIR}/xmms-config" + +FILES_${PN} = "${libdir}/xmms/Input/libxmmsmad.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmsmad.so" + diff --git a/packages/xmms/xmms-tremor_1.0.bb b/packages/xmms/xmms-tremor_1.0.bb new file mode 100644 index 0000000000..d6619d4d97 --- /dev/null +++ b/packages/xmms/xmms-tremor_1.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "xmms plugin for the tremos integer vorbis decoder" +SECTION = "x11/multimedia" +MAINTAINER = "Graeme Gregory <dp@xora.org.uk> +LICENSE = "GPL" +DEPENDS = "xmms tremor" +SRC_URI = "http://mirror1.pdaxrom.org/source/src/xmms-tremor-1.0.tar.bz2" + +inherit autotools + +FILES_${PN} = "${libdir}/xmms/Input/libxmmstremor.so" +FILES_${PN}-dbg = "${libdir}/xmms/Input/.debug/libxmmstremor.so" + diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 05bfb1dc3e..9ee59cef29 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -2,22 +2,39 @@ DESCRIPTION = "The X MultiMedia System" HOMEPAGE = "http://www.xmms.org/" LICENSE = "GPL" SECTION = "x11/multimedia" -# TODO add esd mikmod vorbis -DEPENDS = "gtk+-1.2" +# TODO add esd +DEPENDS = "gtk+-1.2 libvorbis mikmod alsa-lib" SRC_URI = "http://www.xmms.org/files/1.2.x/xmms-${PV}.tar.bz2 \ - file://gcc4.patch;patch=1" + file://gcc4.patch;patch=1 \ + file://xmms-config-dequote.patch;patch=1 \ + file://acinclude.m4 \ + file://xmms.sh" +PR = "r2" -inherit autotools +inherit autotools binconfig -# TODO enable esd mikmod vorbis -EXTRA_OECONF = "--disable-opengl --disable-esd --disable-mikmod --disable-vorbis" +# TODO enable esd +EXTRA_OECONF = "--disable-opengl --disable-esd \ + --with-vorbis-includes=${STAGING_INCDIR} \ + --with-ogg-includes=${STAGING_INCDIR} \ + --with-vorbis-libraries=${STAGING_LIBDIR} \ + --with-ogg-libraries=${STAGING_LIBDIR}" -do_configure() { - oe_runconf +do_configure_prepend() { + cp ${WORKDIR}/acinclude.m4 ${S} + rm ${S}/libxmms/acinclude.m4 || true } -do_compile() { - oe_runmake LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool +do_install_append() { + install -m 0755 ${WORKDIR}/xmms.sh ${D}${bindir} + install -d ${D}${datadir}/applications + install xmms/xmms.desktop ${D}${datadir}/applications + sed -i "s/Exec=xmms/Exec=xmms.sh/" ${D}${datadir}/applications/xmms.desktop + install -d ${D}${datadir}/pixmaps + install xmms/xmms_mini.xpm ${D}${datadir}/pixmaps } +do_stage() { + autotools_stage_all +} diff --git a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb index ff63987713..7d24f07432 100644 --- a/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans-native_X11R7.0-1.0.0.bb @@ -1,6 +1,5 @@ SECTION = "x11/libs" PRIORITY = "optional" -#MAINTAINER = "" LICENSE = "BSD-X" DEPENDS = "util-macros-native" diff --git a/packages/xorg-lib/xtrans/.mtn2git_empty b/packages/xorg-lib/xtrans/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/xtrans/.mtn2git_empty diff --git a/packages/xorg-lib/xtrans/fix-missing-includepath.patch b/packages/xorg-lib/xtrans/fix-missing-includepath.patch new file mode 100644 index 0000000000..043d14f7bf --- /dev/null +++ b/packages/xorg-lib/xtrans/fix-missing-includepath.patch @@ -0,0 +1,13 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- xtrans-X11R7.0-1.0.0/xtrans.pc.in~fix-missing-includepath 2005-07-02 20:00:50.000000000 +0200 ++++ xtrans-X11R7.0-1.0.0/xtrans.pc.in 2006-08-11 19:27:58.000000000 +0200 +@@ -6,4 +6,4 @@ + Name: XTrans + Description: Abstract network code for X + Version: @PACKAGE_VERSION@ +-Cflags: -I${includedir} -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@ ++Cflags: -I${includedir} -I${includedir}/X11/Xtrans -D_BSD_SOURCE @fchown_define@ @sticky_bit_define@ diff --git a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb index 1ab38ad838..2c38782a57 100644 --- a/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/xtrans_X11R7.0-1.0.0.bb @@ -1,8 +1,9 @@ require xorg-lib-common.inc +PR = "r1" + +SRC_URI += "file://fix-missing-includepath.patch;patch=1" DESCRIPTION = "network API translation layer to \ insulate X applications and libraries from OS \ network vageries." -#DEPENDS += " " - |