diff options
-rw-r--r-- | conf/checksums.ini | 12 | ||||
-rw-r--r-- | recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff | 12 | ||||
-rw-r--r-- | recipes/gstreamer/gst-ffmpeg_0.10.7.bb | 32 | ||||
-rw-r--r-- | recipes/kexecboot/kexecboot_0.4.bb | 6 | ||||
-rw-r--r-- | recipes/kexecboot/kexecboot_0.5.bb | 5 | ||||
-rw-r--r-- | recipes/kexecboot/kexecboot_git.bb | 17 | ||||
-rw-r--r-- | recipes/linux/files/linux-2.6-limits.patch | 10 | ||||
-rw-r--r-- | recipes/linux/linux-epia_2.6.19.2.bb | 3 | ||||
-rw-r--r-- | recipes/linux/linux-nokia800_2.6.18-osso40.bb | 3 | ||||
-rw-r--r-- | recipes/linux/linux-nokia800_2.6.21-osso71.bb | 3 | ||||
-rw-r--r-- | recipes/mc/mc.inc | 5 | ||||
-rw-r--r-- | recipes/mc/mc_4.6.2.bb | 2 |
12 files changed, 85 insertions, 25 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index d9f5b902ae..a88da9eddc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9254,6 +9254,10 @@ sha256=840015b4e0f0e7248b178eafc37476d6eb9aea3876eb3b07e2a66b430b526da2 md5=063a8184916426d6b79a97dea9636a78 sha256=c9a5f4c9b1eddd7cb042d83390072f832f19f3712d023e4d6568391e5eb4878a +[http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.7.tar.bz2] +md5=6be89b26592f36ef631b22a68b8e06c4 +sha256=94bd5110a03837145afe5c81760f22bd7bef9ef455f4417340eeeb2b12e54fb0 + [http://core.fluendo.com/gstreamer/src/gst-fluendo-mp3/gst-fluendo-mp3-0.10.2.tar.bz2] md5=f3c32e0bc3ec1be461ce43e407a6a67f sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5 @@ -11190,15 +11194,11 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d md5=b4f7ffcc294d41a6a4c40d6e44b7734d sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 -[http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz] -md5=3c3b8edb739146183b3ddff3e0af5f1c -sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96 - -[http://projects.linuxtogo.org/~jay7/kexecboot-0.4.tar.gz] +[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.4.tar.gz] md5=b4a4509ca3f546cfedd23aa6f99ab81d sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890 -[http://projects.linuxtogo.org/frs/download.php/226/kexecboot-0.5.tar.gz] +[http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-0.5.tar.gz] md5=a937303d7ef3fc645f9dccf89e1494e2 sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab diff --git a/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff b/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff new file mode 100644 index 0000000000..874ba57777 --- /dev/null +++ b/recipes/gstreamer/gst-ffmpeg-0.10.7/configure-hack.diff @@ -0,0 +1,12 @@ +Index: gst-ffmpeg-0.10.7/configure.ac +=================================================================== +--- gst-ffmpeg-0.10.7.orig/configure.ac 2009-03-21 00:44:01.000000000 +0000 ++++ gst-ffmpeg-0.10.7/configure.ac 2009-03-30 20:45:05.000000000 +0000 +@@ -337,7 +337,6 @@ + AC_SUBST(FFMPEG_SVN) + AC_SUBST(FFMPEG_REVISION) + AC_SUBST(FFMPEG_EXTERNALS_REVISION) +- AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg) + AC_MSG_NOTICE([Using included FFMpeg code]) + fi + diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb new file mode 100644 index 0000000000..20cea128dd --- /dev/null +++ b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "FFmpeg-based GStreamer plug-in" +SECTION = "multimedia" +PRIORITY = "optional" +LICENSE = "LGPL" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib" +PR = "r1" + +inherit autotools pkgconfig + +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ + file://configure-hack.diff;patch=1 \ + file://lower-rank.diff;patch=1 \ +" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a" + +EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \ + --disable-vorbis --disable-vorbistest --disable-encoders \ + --disable-v4l --disable-audio-oss --disable-dv1394 \ + --disable-vhook --with-system-ffmpeg --disable-ffserver \ + --enable-pp --disable-decoder-vorbis" + +# We do this because the install program is called with -s which causes it to +# call "strip" and it then mangles cross compiled stuff.. +PATH_prepend="${CROSS_DIR}/${TARGET_SYS}/bin:" + +# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg +CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}" + diff --git a/recipes/kexecboot/kexecboot_0.4.bb b/recipes/kexecboot/kexecboot_0.4.bb index c38b2b402c..da93aeb34e 100644 --- a/recipes/kexecboot/kexecboot_0.4.bb +++ b/recipes/kexecboot/kexecboot_0.4.bb @@ -1,6 +1,6 @@ -PR = "r5" +PR = "r6" -SRC_URI = "http://projects.linuxtogo.org/~jay7/kexecboot-${PV}.tar.gz \ +SRC_URI = "http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-${PV}.tar.gz \ file://add-reboot-option.patch;patch=1 \ file://scan_devices-top.patch;patch=1 \ file://graphical-no-devices.patch;patch=1 \ @@ -10,6 +10,4 @@ SRC_URI = "http://projects.linuxtogo.org/~jay7/kexecboot-${PV}.tar.gz \ file://kexecboot-tosa.patch;patch=1 \ file://fb-render-16bit.patch;patch=1" -S = "${WORKDIR}/kexecboot-${PV}" - require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_0.5.bb b/recipes/kexecboot/kexecboot_0.5.bb index b901903a2a..f4474f7136 100644 --- a/recipes/kexecboot/kexecboot_0.5.bb +++ b/recipes/kexecboot/kexecboot_0.5.bb @@ -1,4 +1,5 @@ -SRC_URI = "http://projects.linuxtogo.org/frs/download.php/226/kexecboot-${PV}.tar.gz \ - " +PR = "r1" + +SRC_URI = "http://projects.linuxtogo.org/frs/?group_id=50/kexecboot-${PV}.tar.gz " require kexecboot.inc diff --git a/recipes/kexecboot/kexecboot_git.bb b/recipes/kexecboot/kexecboot_git.bb index 97a3f27512..c5e91f080e 100644 --- a/recipes/kexecboot/kexecboot_git.bb +++ b/recipes/kexecboot/kexecboot_git.bb @@ -1,14 +1,17 @@ -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "git://git.linuxtogo.org/home/thesing/kexecboot.git;protocol=git " -SRCREV = "8823a939a38a8a3287f90dee062e8ab8569f884f" +SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git " +SRCREV = "c5f17845f0f620adff854c2239a8aaa5d9942255" -# v0.5 -#tag=8823a939a38a8a3287f90dee062e8ab8569f884f +# v0.51 (pre cfg-files) +#SRCREV = "c5f17845f0f620adff854c2239a8aaa5d9942255" -# v0.4 -#tag=d7af5356df4f25203831403c69f1a263c163f31a +# v0.5 (add rescan / reboot) +#SRCREV = "8823a939a38a8a3287f90dee062e8ab8569f884f" + +# v0.4 (add bootlogo) +#SRCREV = "d7af5356df4f25203831403c69f1a263c163f31a" S = "${WORKDIR}/git" diff --git a/recipes/linux/files/linux-2.6-limits.patch b/recipes/linux/files/linux-2.6-limits.patch new file mode 100644 index 0000000000..777a2fa671 --- /dev/null +++ b/recipes/linux/files/linux-2.6-limits.patch @@ -0,0 +1,10 @@ +--- linux/scripts/mod/sumversion.c.orig 2009-03-15 21:44:58.000000000 +0100 ++++ linux/scripts/mod/sumversion.c 2009-03-15 21:44:58.000000000 +0100 +@@ -8,6 +8,7 @@ + #include <errno.h> + #include <string.h> + #include "modpost.h" ++#include <linux/limits.h> + + /* + * Stolen form Cryptographic API. diff --git a/recipes/linux/linux-epia_2.6.19.2.bb b/recipes/linux/linux-epia_2.6.19.2.bb index 29f53a4dae..ce253c45c6 100644 --- a/recipes/linux/linux-epia_2.6.19.2.bb +++ b/recipes/linux/linux-epia_2.6.19.2.bb @@ -6,7 +6,8 @@ PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://epia_defconfig" + file://epia_defconfig \ + file://linux-2.6-limits.patch;patch=1" S = "${WORKDIR}/linux-${PV}" COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/recipes/linux/linux-nokia800_2.6.18-osso40.bb b/recipes/linux/linux-nokia800_2.6.18-osso40.bb index 3ffa1d838a..047acc1c9c 100644 --- a/recipes/linux/linux-nokia800_2.6.18-osso40.bb +++ b/recipes/linux/linux-nokia800_2.6.18-osso40.bb @@ -1,6 +1,6 @@ require linux-nokia800.inc -PR = "r4" +PR = "r5" SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \ http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-r ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \ ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \ file://fix_oprofile.patch;patch=1 \ + file://linux-2.6-limits.patch;patch=1 \ file://defconfig" SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1" diff --git a/recipes/linux/linux-nokia800_2.6.21-osso71.bb b/recipes/linux/linux-nokia800_2.6.21-osso71.bb index 904d2021c1..1ac4cf1468 100644 --- a/recipes/linux/linux-nokia800_2.6.21-osso71.bb +++ b/recipes/linux/linux-nokia800_2.6.21-osso71.bb @@ -1,5 +1,5 @@ require linux-nokia800.inc -PR = "r4" +PR = "r5" DEFAULT_PREFERENCE_nokia770 = "-1" @@ -7,6 +7,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \ http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \ http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \ file://suspend-button.patch;patch=1 \ + file://linux-2.6-limits.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.21" diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc index 3c622ec736..6bd3ebeb99 100644 --- a/recipes/mc/mc.inc +++ b/recipes/mc/mc.inc @@ -11,13 +11,14 @@ SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar. inherit autotools -EXTRA_OECONF = "--libexecdir=${libdir} --disable-glibtest --without-x --without-samba \ +EXTRA_OECONF = "--disable-glibtest --without-x --without-samba \ --without-nfs --without-gpm-mouse --with-screen=ncurses" PACKAGES += "${PN}-extfs ${PN}-hilite" -FILES_${PN} = "${bindir}/ ${libdir}/ ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d" +FILES_${PN} = "${bindir}/ ${libexecdir}/mc ${datadir}/mc/*.charsets ${datadir}/mc/*.ext ${datadir}/mc/*.hint ${datadir}/mc/*.hlp ${datadir}/mc/*.lib ${datadir}/mc/*.menu ${datadir}/mc/*.rc ${datadir}/mc/bin /etc/profile.d" FILES_${PN}-extfs = "${datadir}/mc/extfs/" FILES_${PN}-hilite = "${datadir}/mc/syntax/" +FILES_${PN}-dbg += "${libexecdir}/mc/.debug" RRECOMMENDS_${PN} += "${PN}-extfs ${PN}-hilite" RDEPENDS_${PN}-extfs = "${PN}" RDEPENDS_${PN}-hilite = "${PN}" diff --git a/recipes/mc/mc_4.6.2.bb b/recipes/mc/mc_4.6.2.bb index 9310857b66..75d2a1b551 100644 --- a/recipes/mc/mc_4.6.2.bb +++ b/recipes/mc/mc_4.6.2.bb @@ -23,7 +23,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${P}.tar.gz \ file://mc-cursor-appearance.patch;patch=1 \ file://mc-esc-seq.patch;patch=1" -EXTRA_OECONF = "--libexecdir=${libdir} --without-x --without-samba \ +EXTRA_OECONF = "--without-x --without-samba \ --without-nfs --without-gpm-mouse --enable-charset" do_unpack_append() { |