diff options
122 files changed, 4126 insertions, 811 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index ca5303d97f..005e7cc0e9 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -10,6 +10,7 @@ export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index b29d86cefd..133859d5a0 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -13,6 +13,8 @@ FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \ inherit autotools pkgconfig gconf +AUTOTOOLS_STAGE_PKGCONFIG = "1" + gnome_stage_includes() { autotools_stage_includes } diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index c3e4b41b97..3615bb965c 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -126,7 +126,7 @@ PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515" PREFERRED_VERSION_bzip2 ?= "1.0.2" PREFERRED_VERSION_cacao-cldc ?= "0.98" PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98" -PREFERRED_VERSION_cairo ?= "1.4.10" +PREFERRED_VERSION_cairo ?= "1.6.4" PREFERRED_VERSION_cairo-directfb ?= "1.4.8" PREFERRED_VERSION_cairomm ?= "1.2.4" PREFERRED_VERSION_calendar ?= "1.0" @@ -465,7 +465,7 @@ PREFERRED_VERSION_gizmod ?= "2.3" PREFERRED_VERSION_gkrellm ?= "2.2.10" PREFERRED_VERSION_glib-1.2 ?= "1.2.10" PREFERRED_VERSION_glib-1.2-native ?= "1.2.10" -PREFERRED_VERSION_glib-2.0 ?= "2.16.1" +PREFERRED_VERSION_glib-2.0 ?= "2.16.4" PREFERRED_VERSION_glib-2.0-native ?= "2.16.1" PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" @@ -616,7 +616,7 @@ PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gstreamer ?= "0.10.17" PREFERRED_VERSION_gthumb ?= "2.6.9" -PREFERRED_VERSION_gtk+ ?= "2.10.14" +PREFERRED_VERSION_gtk+ ?= "2.12.11" PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2" diff --git a/packages/dvbtools/wscan_20080720.bb b/packages/dvbtools/wscan_20080720.bb new file mode 100644 index 0000000000..b71fb2bf18 --- /dev/null +++ b/packages/dvbtools/wscan_20080720.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Wscan is a dvb channel scanner that doesn't require an initial frequency table" +LICENSE = "GPLv2" + +SRC_URI = "http://wirbel.htpc-forum.de/w_scan/w_scan-${PV}.tar.bz2" +S = "${WORKDIR}/w_scan-${PV}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 w_scan ${D}/${bindir}/ + + install -d ${D}/${datadir}/w_scan + install -m 0644 *.ids *.classes ${D}/${datadir}/w_scan/ +} + +FILES_${PN} += "${datadir}" diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index c93261283f..0cbfce233c 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r21" +PR = "r23" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -44,7 +44,7 @@ EXTRA_OECONF = " \ --enable-libfaadbin \ --enable-libgsm \ --enable-libmp3lame \ - --disable-swscale \ + --enable-swscale \ --arch=${TARGET_ARCH} \ --enable-cross-compile \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -93,8 +93,9 @@ do_stage() { install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h done - install -m 0644 ${S}/libswscale/swscale.h ${STAGING_INCDIR}/ffmpeg/swscale.h - install -m 0644 ${S}/libswscale/rgb2rgb.h ${STAGING_INCDIR}/ffmpeg/rgb2rgb.h + install -d ${STAGING_INCDIR}/libswscale/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ install -d ${STAGING_INCDIR}/libpostproc install -d ${STAGING_INCDIR}/postproc diff --git a/packages/fvwm/.mtn2git_empty b/packages/fvwm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fvwm/.mtn2git_empty diff --git a/packages/fvwm/files/.mtn2git_empty b/packages/fvwm/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/fvwm/files/.mtn2git_empty diff --git a/packages/fvwm/files/acinclude.m4.patch b/packages/fvwm/files/acinclude.m4.patch new file mode 100644 index 0000000000..59c4275bf3 --- /dev/null +++ b/packages/fvwm/files/acinclude.m4.patch @@ -0,0 +1,32 @@ +upstream: OE-only +origin: Yuri Bushmelev <jay4mail at gmail.com> +comment: disable xft-config calls while cross-compiling +--- fvwm-2.5.26/acinclude.m4.orig 2008-06-10 01:53:46.000000000 +0400 ++++ fvwm-2.5.26/acinclude.m4 2008-06-10 01:53:51.000000000 +0400 +@@ -1225,14 +1225,14 @@ + XFT_CONFIG=$xft_config_prefi |