diff options
24 files changed, 122 insertions, 34 deletions
diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb index 84de68c1a0..41652828bf 100644 --- a/packages/abiword/abiword-plugins_2.4.6.bb +++ b/packages/abiword/abiword-plugins_2.4.6.bb @@ -5,6 +5,8 @@ LICENSE = "GPLv2" DEPENDS = "libwpd librsvg goffice poppler" RDEPENDS = "abiword" +PR = "r1" + SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" diff --git a/packages/abiword/abiword-plugins_2.5.1.bb b/packages/abiword/abiword-plugins_2.5.1.bb index 10b7ba2de7..ec11982ad7 100644 --- a/packages/abiword/abiword-plugins_2.5.1.bb +++ b/packages/abiword/abiword-plugins_2.5.1.bb @@ -5,6 +5,8 @@ LICENSE = "GPLv2" DEPENDS = "libwpd librsvg goffice poppler libglade" RDEPENDS = "abiword" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \ diff --git a/packages/abiword/abiword-plugins_2.5.2.bb b/packages/abiword/abiword-plugins_2.5.2.bb index 54d87ac554..6f739c7b22 100644 --- a/packages/abiword/abiword-plugins_2.5.2.bb +++ b/packages/abiword/abiword-plugins_2.5.2.bb @@ -5,7 +5,9 @@ LICENSE = "GPLv2" DEPENDS = "boost loudmouth libwpd librsvg goffice poppler libglade" RDEPENDS = "abiword" -DEFAULT_PREFERENCE = "-1" +PR = "r1" + +DEFAULT_PREFERENCE = "1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ diff --git a/packages/bluez/bluez-gstreamer-plugin_3.19.bb b/packages/bluez/bluez-gstreamer-plugin_3.19.bb new file mode 100644 index 0000000000..c5a1a9acee --- /dev/null +++ b/packages/bluez/bluez-gstreamer-plugin_3.19.bb @@ -0,0 +1,26 @@ +require bluez-utils3.inc + +DEPENDS += "gstreamer gst-plugins-base " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --enable-gstreamer \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +PACKAGES = "${PN}" + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index ddf90a2248..8f787292ba 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -76,6 +76,7 @@ do_install_append() { rmdir ${D}${bindir} ${D}${sbindir} chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0644 ${S}/rfcomm/rfcomm.conf ${D}${sysconfdir}/bluetooth/ install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ } @@ -86,14 +87,6 @@ INITSCRIPT_PARAMS = "defaults 23 19" PACKAGES =+ "${PN}-compat" -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " FILES_${PN} = " \ ${base_sbindir}/hcid \ diff --git a/packages/bluez/bluez-utils_3.18.bb b/packages/bluez/bluez-utils_3.18.bb index c0a4f460ba..48f147aa69 100644 --- a/packages/bluez/bluez-utils_3.18.bb +++ b/packages/bluez/bluez-utils_3.18.bb @@ -18,6 +18,12 @@ EXTRA_OECONF = " \ --enable-test \ " +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth"
\ No newline at end of file diff --git a/packages/bluez/bluez-utils_3.19.bb b/packages/bluez/bluez-utils_3.19.bb index c0a4f460ba..48f147aa69 100644 --- a/packages/bluez/bluez-utils_3.19.bb +++ b/packages/bluez/bluez-utils_3.19.bb @@ -18,6 +18,12 @@ EXTRA_OECONF = " \ --enable-test \ " +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth"
\ No newline at end of file diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 2681b941d2..8426b75a17 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -3,6 +3,8 @@ LICENSE = "BSD" DEPENDS = "poppler0.6 evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" +PR = "r1" + inherit efl_library SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \ diff --git a/packages/epdfview/epdfview_0.1.2.bb b/packages/epdfview/epdfview_0.1.2.bb index 397bef6fe8..92d4e4c30c 100644 --- a/packages/epdfview/epdfview_0.1.2.bb +++ b/packages/epdfview/epdfview_0.1.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+" -PR="r2" +PR="r3" SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" diff --git a/packages/epdfview/epdfview_0.1.3.bb b/packages/epdfview/epdfview_0.1.3.bb index 94bc3a51ab..397bef6fe8 100644 --- a/packages/epdfview/epdfview_0.1.3.bb +++ b/packages/epdfview/epdfview_0.1.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+" -PR="r1" +PR="r2" SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" diff --git a/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb index 94bc3a51ab..397bef6fe8 100644 --- a/packages/epdfview/epdfview_0.1.4.bb +++ b/packages/epdfview/epdfview_0.1.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+" -PR="r1" +PR="r2" SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" diff --git a/packages/epdfview/epdfview_0.1.5.bb b/packages/epdfview/epdfview_0.1.5.bb index 14966601c2..dee0e3aca1 100644 --- a/packages/epdfview/epdfview_0.1.5.bb +++ b/packages/epdfview/epdfview_0.1.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+ cups" -PR="r1" +PR="r2" SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" diff --git a/packages/epdfview/epdfview_0.1.6.bb b/packages/epdfview/epdfview_0.1.6.bb index 14966601c2..dee0e3aca1 100644 --- a/packages/epdfview/epdfview_0.1.6.bb +++ b/packages/epdfview/epdfview_0.1.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+ cups" -PR="r1" +PR="r2" SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" diff --git a/packages/evince/evince_0.5.2.bb b/packages/evince/evince_0.5.2.bb index 90bb59860f..54e25eb49c 100644 --- a/packages/evince/evince_0.5.2.bb +++ b/packages/evince/evince_0.5.2.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" +PR = "r2" inherit gnome pkgconfig diff --git a/packages/evince/evince_0.6.1.bb b/packages/evince/evince_0.6.1.bb index 3b3c5984ab..d2b7cbe5ea 100644 --- a/packages/evince/evince_0.6.1.bb +++ b/packages/evince/evince_0.6.1.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff libxt espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" RDEPENDS = "espgs gconf" RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r0" +PR = "r1" inherit gnome pkgconfig diff --git a/packages/evince/evince_0.9.0.bb b/packages/evince/evince_0.9.0.bb index 64e2e41275..815b30e5eb 100644 --- a/packages/evince/evince_0.9.0.bb +++ b/packages/evince/evince_0.9.0.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS = "espgs " RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" +PR = "r2" inherit gnome pkgconfig gtk-icon-cache diff --git a/packages/evince/evince_0.9.2.bb b/packages/evince/evince_0.9.2.bb index 51bc969bff..f4fe253d1f 100644 --- a/packages/evince/evince_0.9.2.bb +++ b/packages/evince/evince_0.9.2.bb @@ -4,7 +4,7 @@ SECTION = "x11/office" DEPENDS = "tiff djvulibre libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " RDEPENDS = "espgs " RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" +PR = "r2" inherit gnome pkgconfig gtk-icon-cache diff --git a/packages/gcc/files/.mtn2git_empty b/packages/gcc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gcc/files/.mtn2git_empty diff --git a/packages/gcc/files/gfortran.patch b/packages/gcc/files/gfortran.patch new file mode 100644 index 0000000000..96905e5d7d --- /dev/null +++ b/packages/gcc/files/gfortran.patch @@ -0,0 +1,40 @@ +The patch below fixes a crash building libgfortran on arm-linux-gnueabi. + +This target doesn't really have a 128-bit integer type, however it does use +TImode to represent the return value of certain special ABI defined library +functions. This results in type_for_size(TImode) being called. + +Because TImode deosn't correspond to any gfortran integer kind +gfc_type_for_size returns NULL and we segfault shortly after. + +The patch below fixes this by making gfc_type_for_size handle TImode in the +same way as the C frontend. + +Tested on x86_64-linux and arm-linux-gnueabi. +Applied to trunk. + +Paul + +2007-05-15 Paul Brook <paul@codesourcery.com> + + gcc/fortran/ + * trans-types.c (gfc_type_for_size): Handle signed TImode. + +Index: gcc-4.2.1/gcc/fortran/trans-types.c +=================================================================== +--- gcc-4.2.1/gcc/fortran/trans-types.c (revision 170435) ++++ gcc-4.2.1/gcc/fortran/trans-types.c (working copy) +@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un + if (type && bits == TYPE_PRECISION (type)) + return type; + } ++ ++ /* Handle TImode as a special case because it is used by some backends ++ (eg. ARM) even though it is not available for normal use. */ ++#if HOST_BITS_PER_WIDE_INT >= 64 ++ if (bits == TYPE_PRECISION (intTI_type_node)) ++ return intTI_type_node; ++#endif + } + else + { diff --git a/packages/gcc/gcc-cross_4.1.2.bb b/packages/gcc/gcc-cross_4.1.2.bb index 003fd9e79e..34f083b111 100644 --- a/packages/gcc/gcc-cross_4.1.2.bb +++ b/packages/gcc/gcc-cross_4.1.2.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r6" +PR = "r7" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index a9e4a0ddc2..9433c237f4 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r4" +PR = "r5" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_4.1.2.bb b/packages/gcc/gcc_4.1.2.bb index 39980bf8b5..9e05ae638c 100644 --- a/packages/gcc/gcc_4.1.2.bb +++ b/packages/gcc/gcc_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -30,19 +30,23 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ file://unbreak-armv4t.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ - " + file://gfortran.patch;patch=1 \ + " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits -# 'fortran' or '', not 'f77' like gcc3 had +# ',fortran' or '', not 'f77' like gcc3 had FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" HAS_GFORTRAN = "no" -HAS_G2C = "no" +HAS_GFORTRAN_linux-gnueabi = "yes" +HAS_G2C = "yes" #Set the java bits -JAVA_arm = "" JAVA = "" +JAVA_arm = "" + LANGUAGES = "c,c++${FORTRAN}${JAVA}" require gcc3-build.inc diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index 7c50167345..a4ac7a99a4 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r3" +PR = "r4" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -55,19 +55,22 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-crunch-truncsi-disable.patch;patch=1 \ file://arm-crunch-cfcvt64-disable.patch;patch=1 \ file://arm-crunch-cirrus-bugfixes.patch;patch=1 \ - " + file://gfortran.patch;patch=1 \ + " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " #Set the fortran bits -# 'fortran' or '', not 'f77' like gcc3 had +# 'i,fortran' or '', not 'f77' like gcc3 had FORTRAN = "" +FORTRAN_linux-gnueabi = ",fortran" HAS_GFORTRAN = "no" -HAS_G2C = "no" +HAS_GFORTRAN_linux-gnueabi = "yes" +HAS_G2C = "yes" #Set the java bits -JAVA_arm = "" JAVA = "" +JAVA_arm = "" LANGUAGES = "c,c++${FORTRAN}${JAVA}" require gcc3-build.inc diff --git a/packages/tracker/tracker_0.5.4.bb b/packages/tracker/tracker_0.5.4.bb index d10a2a646b..e9a7c79a80 100644 --- a/packages/tracker/tracker_0.5.4.bb +++ b/packages/tracker/tracker_0.5.4.bb @@ -2,6 +2,8 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata ab LICENSE = "GPLv2" DEPENDS = "file gtk+ gstreamer gamin libgmime dbus poppler libexif libgsf" +PR = "r1" + SRC_URI = "http://www.gnome.org/~jamiemcc/tracker/tracker-${PV}.tar.gz \ file://no-ioprio.patch;patch=1" |