From 732a0b122d1c0b0928cee833863a5fa60370efc9 Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Fri, 1 Jan 2010 16:27:50 +0100 Subject: libwmf: new recipe, libwmf id a library for converting WMF files Note that the native recipe(which depend on the non-native recipe) is needed for a future fix for abiword 2.8.1 --- recipes/libwmf/libwmf-native_0.2.8.4.bb | 4 ++++ recipes/libwmf/libwmf_0.2.8.4.bb | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 recipes/libwmf/libwmf-native_0.2.8.4.bb create mode 100644 recipes/libwmf/libwmf_0.2.8.4.bb diff --git a/recipes/libwmf/libwmf-native_0.2.8.4.bb b/recipes/libwmf/libwmf-native_0.2.8.4.bb new file mode 100644 index 0000000000..a33461fcdb --- /dev/null +++ b/recipes/libwmf/libwmf-native_0.2.8.4.bb @@ -0,0 +1,4 @@ +require libwmf_0.2.8.4.bb +inherit native + +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/libwmf/${PV}/libwmf-${PV}.tar.gz;name=tarball" diff --git a/recipes/libwmf/libwmf_0.2.8.4.bb b/recipes/libwmf/libwmf_0.2.8.4.bb new file mode 100644 index 0000000000..fc02940eb3 --- /dev/null +++ b/recipes/libwmf/libwmf_0.2.8.4.bb @@ -0,0 +1,12 @@ +inherit autotools_stage + +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${PN}/${PV}/${P}.tar.gz;name=tarball" +SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" +SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" + +DESCRIPTION = "Library for converting WMF files" +HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html" +LICENSE = "GPL-2" + +SECTION = "libs" + -- cgit v1.2.3 From cbf0a993d3fb1efc496ea222e70aa44530aed1af Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Fri, 1 Jan 2010 16:30:46 +0100 Subject: abiword 2.8.1: multiple fixes *Fixed compilation removing DOLT (from http://dolt.freedesktop.org/) fom configure.in, else it would file like this(output stripped) : .../doltlibtool: exec: .../libtool: cannot execute: No such file or directory note that it looks for libtool and not ${TARGET_ARCH}-angstrom-linux-libtool in my case,more informations are disponible reading the m4 dolt file here: http://cgit.freedesktop.org/dolt/tree/dolt.m4 *fixed libwmf problem: libwmf-config is a program that is used for knowing the compilations flags like that : libwmf-config --cflags -I/usr/include/freetype2 -I/usr/include ->But like the in example the host version was called and so some /usr/include were included into the build process, --with-libwmf-config=${STAGING_DIR} fixes it ->also depend on the native libwmf so it is not required on the host in order to build abiword *fixed runtime problem with the plugins: In the trunk(which regenerate configure files like we do), autogen-common.sh was called by autogen.sh And not calling it creates issues like for instance the absence of the the collab plugin in the installation directory --- recipes/abiword/abiword_2.8.1.bb | 15 ++++++++++++--- recipes/abiword/files/autogen-common.sh | 28 ++++++++++++++++++++++++++++ recipes/abiword/files/nodolt.patch | 12 ++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100755 recipes/abiword/files/autogen-common.sh create mode 100644 recipes/abiword/files/nodolt.patch diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb index 8f9bbee2ee..34a03479c8 100644 --- a/recipes/abiword/abiword_2.8.1.bb +++ b/recipes/abiword/abiword_2.8.1.bb @@ -1,8 +1,10 @@ require abiword-2.5.inc -PR = "r2" +PR = "r3" -SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" +SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ + file://autogen-common.sh \ + file://nodolt.patch;patch=1" do_configure() { autotools_do_configure @@ -13,8 +15,9 @@ EXTRA_OECONF = " --disable-static \ --enable-collab-backend-xmpp \ --enable-collab-backend-tcp \ --enable-collab-backend-service \ + --with-libwmf-config=${STAGING_DIR} \ " - +DEPENDS += " libwmf-native " RCONFLICTS = "abiword-embedded" FILES_${PN} += "${libdir}/libabiword-*.so ${datadir}/mime-info ${datadir}/abiword-${SHRT_VER}/certs ${datadir}/abiword-${SHRT_VER}/ui ${datadir}/abiword-${SHRT_VER}/xsl* ${datadir}/abiword-${SHRT_VER}/mime-info ${datadir}/abiword-${SHRT_VER}/Pr*.xml" @@ -23,6 +26,12 @@ FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profil PACKAGES_DYNAMIC = "abiword-meta abiword-plugin-*" +do_configure_prepend () { + install -m 0755 ${WORKDIR}/autogen-common.sh ${S}/autogen-common.sh + cd ${S} + ./autogen-common.sh +} + python populate_packages_prepend () { abiword_libdir = bb.data.expand('${libdir}/abiword-2.8/plugins', d) do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') diff --git a/recipes/abiword/files/autogen-common.sh b/recipes/abiword/files/autogen-common.sh new file mode 100755 index 0000000000..c1f10e1a4d --- /dev/null +++ b/recipes/abiword/files/autogen-common.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# find plugins Makefile templates +find plugins -name Makefile.am | sed 's|.am$||g' > plugin-makefiles.m4 + +# create plugin list +(cd plugins && find . -maxdepth 1 -type d | grep -v '^\.$' | grep -v '\./\.' | sed 's|\./||g' | xargs echo) > plugin-list.m4 + +# create conditionals for builtin plugins +(for plugin in `cat plugin-list.m4`; do + u=`echo $plugin | tr '[:lower:]' '[:upper:]'` + echo 'AM_CONDITIONAL(['$u'_BUILTIN], test "$enable_'$plugin'_builtin" == "yes")' +done) > plugin-builtin.m4 + +# create plugin configuration +find plugins -name plugin.m4 | xargs cat > plugin-configure.m4 +#to debug if plugin configuration code misbehaves (instead of the above line): +#rm plugin-configure.m4 +#for f in $(find plugins -name plugin.m4); do +# echo "AC_MSG_RESULT([plugin: $f])" >> plugin-configure.m4 +# cat $f >> plugin-configure.m4 +#done + +# find extra m4 files provided by plugins and symlink them +for f in ` find ./plugins -name '*.m4' | grep -v 'plugin\.m4'`; do + ln -sf $f +done + diff --git a/recipes/abiword/files/nodolt.patch b/recipes/abiword/files/nodolt.patch new file mode 100644 index 0000000000..1546720804 --- /dev/null +++ b/recipes/abiword/files/nodolt.patch @@ -0,0 +1,12 @@ +Index: abiword-2.8.1/configure.in +=================================================================== +--- abiword-2.8.1.orig/configure.in ++++ abiword-2.8.1/configure.in +@@ -132,7 +132,6 @@ AC_PROG_INSTALL + #AC_DISABLE_STATIC + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +-DOLT + AC_PROG_LN_S + + AC_MSG_CHECKING([for platform and toolkit]) -- cgit v1.2.3 From 269aa512ea0bc46f3866c1c8af9f58b3f1596bc7 Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Fri, 1 Jan 2010 17:40:53 +0100 Subject: goffice 0.7.4: fixed compilation removing dolt Fixed compilation removing DOLT (from http://dolt.freedesktop.org/) fom configure.in, else it would file like this(output stripped) : .../doltlibtool: exec: .../libtool: cannot execute: No such file or directory note that it looks for libtool and not ${TARGET_ARCH}-angstrom-linux-libtool in my case,more informations are disponible reading the m4 dolt file here: http://cgit.freedesktop.org/dolt/tree/dolt.m4 --- recipes/gnome/goffice/nodolt.patch | 12 ++++++++++++ recipes/gnome/goffice_0.7.14.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/gnome/goffice/nodolt.patch diff --git a/recipes/gnome/goffice/nodolt.patch b/recipes/gnome/goffice/nodolt.patch new file mode 100644 index 0000000000..ea1777a996 --- /dev/null +++ b/recipes/gnome/goffice/nodolt.patch @@ -0,0 +1,12 @@ +Index: goffice-0.7.14/configure.in +=================================================================== +--- goffice-0.7.14.orig/configure.in ++++ goffice-0.7.14/configure.in +@@ -71,7 +71,6 @@ AC_PROG_YACC + AM_PROG_LEX + AC_PROG_LN_S + AM_PROG_LIBTOOL +-DOLT + AC_STDC_HEADERS + AC_SYS_LARGEFILE + diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb index beb23231db..828e6a270a 100644 --- a/recipes/gnome/goffice_0.7.14.bb +++ b/recipes/gnome/goffice_0.7.14.bb @@ -7,7 +7,8 @@ DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 inherit gnome pkgconfig -SRC_URI += "file://c99math.patch;patch=1" +SRC_URI += " file://c99math.patch;patch=1 \ + file://nodolt.patch;patch=1 " do_stage() { autotools_stage_all -- cgit v1.2.3 From c9da74162657009d91882ed0b7797246072343dd Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Sat, 2 Jan 2010 15:28:16 +0100 Subject: gmime : removed dolt Fixed compilation removing DOLT (from http://dolt.freedesktop.org/) from configure.in, else it would file like this(output stripped): .../doltlibtool: exec: .../libtool: cannot execute: No such file or directory note that it looks for libtool and not ${TARGET_ARCH}-angstrom-linux-libtool in my case,more informations are disponible reading the m4 dolt file here: http://cgit.freedesktop.org/dolt/tree/dolt.m4 Note that we don't bump pr as it was a compile failure and that we didn't modify things that would create a modified binary --- recipes/libgmime/files/nodolt.patch | 12 ++++++++++++ recipes/libgmime/gmime_2.4.10.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/libgmime/files/nodolt.patch diff --git a/recipes/libgmime/files/nodolt.patch b/recipes/libgmime/files/nodolt.patch new file mode 100644 index 0000000000..e4d5259c7b --- /dev/null +++ b/recipes/libgmime/files/nodolt.patch @@ -0,0 +1,12 @@ +Index: gmime-2.4.10/configure.in +=================================================================== +--- gmime-2.4.10.orig/configure.in ++++ gmime-2.4.10/configure.in +@@ -80,7 +80,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar) + + AC_EXEEXT + AC_PROG_LIBTOOL +-DOLT + + AM_MAINTAINER_MODE + diff --git a/recipes/libgmime/gmime_2.4.10.bb b/recipes/libgmime/gmime_2.4.10.bb index d455f3339e..cddaac902e 100644 --- a/recipes/libgmime/gmime_2.4.10.bb +++ b/recipes/libgmime/gmime_2.4.10.bb @@ -7,7 +7,8 @@ DEPENDS = "glib-2.0 zlib" inherit gnome autotools_stage lib_package binconfig SRC_URI += " \ - file://iconv-detect.h" + file://iconv-detect.h \ + file://nodolt.patch;patch=1" EXTRA_OECONF += "--disable-mono" -- cgit v1.2.3 From 29c63b640c4e4c852cf3084232ef67c8fd9d3214 Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Sat, 2 Jan 2010 15:37:32 +0100 Subject: xf86-video-intel 2.9.1 : removed dolt Fixed compilation removing DOLT (from ttp://dolt.freedesktop.org/) from configure.in, else it would file like this(output stripped): .../doltlibtool: exec: .../libtool: cannot execute: No such file or directory note that it looks for libtool and not ${TARGET_ARCH}-angstrom-linux-libtool in my case,more informations are disponible reading the m4 dolt file here: http://cgit.freedesktop.org/dolt/tree/dolt.m4 Note that we don't bump pr as it was a compile failure and that we didn't modify things that would create a modified binary --- recipes/xorg-driver/xf86-video-intel/nodolt.patch | 12 ++++++++++++ recipes/xorg-driver/xf86-video-intel_2.9.1.bb | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 recipes/xorg-driver/xf86-video-intel/nodolt.patch diff --git a/recipes/xorg-driver/xf86-video-intel/nodolt.patch b/recipes/xorg-driver/xf86-video-intel/nodolt.patch new file mode 100644 index 0000000000..c5c0e7b1a2 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-intel/nodolt.patch @@ -0,0 +1,12 @@ +Index: xf86-video-intel-2.9.1/configure.ac +=================================================================== +--- xf86-video-intel-2.9.1.orig/configure.ac ++++ xf86-video-intel-2.9.1/configure.ac +@@ -42,7 +42,6 @@ AC_CONFIG_FILES([ + # Checks for programs. + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-DOLT + AC_PROG_CC + AM_PROG_CC_C_O + diff --git a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb index eed1fcb600..a8faf54643 100644 --- a/recipes/xorg-driver/xf86-video-intel_2.9.1.bb +++ b/recipes/xorg-driver/xf86-video-intel_2.9.1.bb @@ -3,3 +3,5 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" PE = "1" + +SRC_URI += " file://nodolt.patch;patch=1 " -- cgit v1.2.3 From a3e3a952792fcd0a917dfd2eed08b07bdcd63900 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Dec 2009 19:52:54 +0100 Subject: xf86-video-omapfb: refresh patch --- ...mapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch | 70 +++++++++++++++------- recipes/xorg-driver/xf86-video-omapfb_git.bb | 2 +- 2 files changed, 49 insertions(+), 23 deletions(-) diff --git a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch index 5008bba546..509d34c6e9 100644 --- a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch +++ b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch @@ -1,14 +1,14 @@ -From 7bfdb731125e2bd18975a3a0f35e424076d55366 Mon Sep 17 00:00:00 2001 +From a0c063716101ec93dcad30028ba41489926050c9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Dec 2009 21:35:00 +0100 -Subject: [PATCH] omapfb-driver: hack out dpms for xorg 1.7.x +Subject: [PATCH 1/2] omapfb-driver: hack out dpms for xorg 1.7.x --- - src/omapfb-driver.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + src/omapfb-driver.c | 39 --------------------------------------- + 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/src/omapfb-driver.c b/src/omapfb-driver.c -index a9d5fbc..ef92ce4 100644 +index a9d5fbc..36a0d53 100644 --- a/src/omapfb-driver.c +++ b/src/omapfb-driver.c @@ -41,9 +41,6 @@ @@ -21,37 +21,63 @@ index a9d5fbc..ef92ce4 100644 #include /* TODO: we'd like this to come from kernel headers, but that's not a good -@@ -581,7 +578,7 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -580,9 +577,6 @@ OMAPFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + /* NO-OP currently */ pScreen->SaveScreen = OMAPFBSaveScreen; - /* Setup DPMS support */ +- /* Setup DPMS support */ - xf86DPMSInit(pScreen, OMAPFBDPMSSet, 0); -+ //xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0); - +- #ifdef USE_EXA /* EXA init */ -@@ -723,6 +720,7 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) + xf86LoadSubModule(pScrn, "exa"); +@@ -723,38 +717,6 @@ static Bool OMAPFBSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) return TRUE; } -+#if 0 - static void - OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) - { -@@ -754,6 +752,7 @@ OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) - } - - } -+#endif - +-static void +-OMAPFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) +-{ +- OMAPFBPtr ofb = OMAPFB(pScrn); +- +- switch (mode) { +- case DPMSModeOn: +- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_NO_BLANKING)) { +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +- "FBIOBLANK: %s\n", strerror(errno)); +- } +- break; +- case DPMSModeStandby: +- case DPMSModeSuspend: +- /* TODO: Maybe we would want to use the above modes for +- * dimming the LCD? That'd match the functionality +- * (save power) +- */ +- case DPMSModeOff: +- /* OMAPFB only supports on and off */ +- if (ioctl(ofb->fd, FBIOBLANK, (void *)VESA_POWERDOWN)) { +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +- "FBIOBLANK: %s\n", strerror(errno)); +- } +- break; +- break; +- default: +- return; +- } +- +-} +- void OMAPFBPrintCapabilities(ScrnInfoPtr pScrn, -@@ -879,7 +878,7 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin) + struct omapfb_caps *caps, +@@ -879,7 +841,6 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!setupDone) { setupDone = TRUE; xf86AddDriver(&OMAPFB, module, HaveDriverFuncs); - LoaderRefSymLists(fbSymbols, NULL); -+ //LoaderRefSymLists(fbSymbols, NULL); return (pointer)1; } else { if (errmaj) *errmaj = LDR_ONCEONLY; +-- +1.6.5 + diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb index 567331df42..8eb5c9f65b 100644 --- a/recipes/xorg-driver/xf86-video-omapfb_git.bb +++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb @@ -2,7 +2,7 @@ require xorg-driver-video.inc DESCRIPTION = "X.Org X server -- OMAP display driver" -PR_append = "a" +PR_append = "b" SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc" PV = "0.1.1+${PR}+gitr${SRCREV}" -- cgit v1.2.3 From 7204d6bdb16e2b74bdbeee6a5acd10aff72300a6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Dec 2009 20:27:35 +0100 Subject: arora: bump PR --- recipes/webkit/arora.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/webkit/arora.inc b/recipes/webkit/arora.inc index bbd8bfb33e..72ae94beab 100644 --- a/recipes/webkit/arora.inc +++ b/recipes/webkit/arora.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Arora is a lightweight cross-platform web browser" LICENE = "GPLv2" HOMEPAGE = "http://code.google.com/p/arora/" -PR = "r1" +PR = "r2" SRC_URI = "http://arora.googlecode.com/files/arora-${PV}.tar.gz" -- cgit v1.2.3 From a3f120c3c8a49fc53e6d5b092261f268fc780897 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Dec 2009 10:54:20 +0100 Subject: gnome-mplayer svn: bump SRCREV, fix dependencies and packaging --- recipes/gnome-mplayer/gnome-mplayer.inc | 4 ++-- recipes/gnome-mplayer/gnome-mplayer_svn.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc index 2dd4d96297..90a57ca852 100644 --- a/recipes/gnome-mplayer/gnome-mplayer.inc +++ b/recipes/gnome-mplayer/gnome-mplayer.inc @@ -3,7 +3,7 @@ AUTHOR = "Kevin DeKorte " HOMEPAGE = "http://code.google.com/p/gnome-mplayer/" SECTION = "x11/multimedia" LICENSE = "GPL" -DEPENDS = "gtk+ gconf dbus-glib" +DEPENDS = "gtk+ gconf dbus-glib libmusicbrainz libgpod" RDEPENDS = "mplayer" inherit gnome @@ -15,7 +15,7 @@ FILES_${PN}-nautilus-extension = "${libdir}/nautilus/extension*/*.so" FILES_${PN}-dbg += "${libdir}/nautilus/*/.debug" -FILES_${PN} += "${datadir}/icons" +FILES_${PN} += "${datadir}/icons ${datadir}/gnome-control-center/" do_install_append() { sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb index 73dbd079dd..d5d1603330 100644 --- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb +++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb @@ -1,8 +1,8 @@ require gnome-mplayer.inc -SRCREV = "1583" +SRCREV = "1610" PV = "0.9.8+svnr${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/trunk" SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \ -- cgit v1.2.3 From e197d7b594a1a6aebeb0ec476d88ff0871b7c482 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Jan 2010 11:30:37 +0100 Subject: linux-omap 2.6.32: add patch to fix NAND ECC errors --- ...ap2-proper-fix-for-subpage-read-ECC-error.patch | 35 ++++++++++++++++++++++ recipes/linux/linux-omap_2.6.32.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch diff --git a/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch b/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch new file mode 100644 index 0000000000..6e7f706c51 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch @@ -0,0 +1,35 @@ +From 64e4fc11b960da97728e0d87dcf4c1e98f808501 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman +Date: Thu, 31 Dec 2009 07:05:02 -0800 +Subject: [PATCH] MTD: NAND: omap2: proper fix for subpage read ECC errors + +--- + drivers/mtd/nand/omap2.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index 1bb799f..75004fe 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -295,11 +295,14 @@ static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len) + u32 *p = (u32 *)buf; + + /* take care of subpage reads */ +- for (; len % 4 != 0; ) { +- *buf++ = __raw_readb(info->nand.IO_ADDR_R); +- len--; ++ if (len % 4) { ++ if (info->nand.options & NAND_BUSWIDTH_16) ++ omap_read_buf16(mtd, buf, len % 4); ++ else ++ omap_read_buf8(mtd, buf, len % 4); ++ p = (u32 *) (buf + len % 4); ++ len -= len % 4; + } +- p = (u32 *) buf; + + /* configure and start prefetch transfer */ + ret = gpmc_prefetch_enable(info->gpmc_cs, 0x0, len, 0x0); +-- +1.6.5 + diff --git a/recipes/linux/linux-omap_2.6.32.bb b/recipes/linux/linux-omap_2.6.32.bb index f8472b3a21..285c260c41 100644 --- a/recipes/linux/linux-omap_2.6.32.bb +++ b/recipes/linux/linux-omap_2.6.32.bb @@ -29,6 +29,7 @@ file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;patch=1 \ file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;patch=1 \ file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \ file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \ +file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \ file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;patch=1 \ file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \ file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \ -- cgit v1.2.3 From eae7a9e4e8c26dc7ca363a4687a68ce5e02b63ab Mon Sep 17 00:00:00 2001 From: Gregoire Gentil Date: Wed, 30 Dec 2009 16:57:53 +0000 Subject: xscreensaver 5.07: Fix build with new xorg --- recipes/xscreensaver/xscreensaver-5.07/dpms-header.patch | 10 ++++++++++ recipes/xscreensaver/xscreensaver_5.07.bb | 1 + 2 files changed, 11 insertions(+) create mode 100644 recipes/xscreensaver/xscreensaver-5.07/dpms-header.patch diff --git a/recipes/xscreensaver/xscreensaver-5.07/dpms-header.patch b/recipes/xscreensaver/xscreensaver-5.07/dpms-header.patch new file mode 100644 index 0000000000..5ecff4fadc --- /dev/null +++ b/recipes/xscreensaver/xscreensaver-5.07/dpms-header.patch @@ -0,0 +1,10 @@ +--- xscreensaver-5.07/driver/dpms.c 2009-12-29 11:54:19.000000000 -0800 ++++ xscreensaver-5.07/driver/dpms.c 2009-12-29 11:54:04.000000000 -0800 +@@ -55,6 +55,7 @@ + + # include + # include ++# include + + /* Why this crap is not in a header file somewhere, I have no idea. Losers! + */ diff --git a/recipes/xscreensaver/xscreensaver_5.07.bb b/recipes/xscreensaver/xscreensaver_5.07.bb index ab810a7e0e..ba80236f66 100644 --- a/recipes/xscreensaver/xscreensaver_5.07.bb +++ b/recipes/xscreensaver/xscreensaver_5.07.bb @@ -4,6 +4,7 @@ PR = "${INC_PR}.0" SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ file://glfix.patch;patch=1 \ + file://dpms-header.patch;patch=1 \ file://XScreenSaver" -- cgit v1.2.3 From 234dff3ab6f902084ea34eec1580da3073fa2657 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Jan 2010 09:23:26 +0100 Subject: mplayer: bump SRCREV --- recipes/mplayer/mplayer_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 93e7523c3e..2d5adc1792 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://mplayer-lavc-arm.patch;patch=1 \ " -SRCREV = "29934" +SRCREV = "30165" SRC_URI_append_armv7a = " \ file://omapfb.patch;patch=1 \ file://vo_omapfb.c \ -- cgit v1.2.3 From b7d812a8fa631d0201edfeece0e17e1192267d77 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Jan 2010 09:23:47 +0100 Subject: angstrom: update mplayer preferred version --- conf/distro/angstrom-2008.1.conf | 3 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 01489b036e..85d6f3f48a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -134,9 +134,6 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl" -# The default is too old for linux-libc-headers-2.6.31: -PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789" - ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index d61e0e258e..18df733fa1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -25,6 +25,7 @@ PREFERRED_VERSION_libtool-sdk = "2.2.6a" PREFERRED_VERSION_mesa = "7.6" PREFERRED_VERSION_mesa-dri = "7.6" PREFERRED_VERSION_mesa-xlib = "7.6" +PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" -- cgit v1.2.3 From f356ede9adb6357ec434d0ec4ada73853d98c8a0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Jan 2010 12:48:32 +0100 Subject: mythtv 0.22: switch to 0.22+fixes --- recipes/mythtv/mythtv_0.22.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/mythtv/mythtv_0.22.bb b/recipes/mythtv/mythtv_0.22.bb index 43e09aa705..32513cf27f 100644 --- a/recipes/mythtv/mythtv_0.22.bb +++ b/recipes/mythtv/mythtv_0.22.bb @@ -8,23 +8,27 @@ RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mytht mysql5-server mysql5-client libmysqlclient qt4-plugin-sqldriver-sqlmysql xmltv" RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16" +PR = "${SRCREV}+r6" PV = "0.22" -PR = "r2" + # REALPV is here to support release candidates # OE in that case has as PV something like 0.21+0.22rc1 # but for packaging the real PV is needed REALPV = "0.22" +SRCREV = "23062" +SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-22-fixes;module=mythtv;proto=http" + +S = "${WORKDIR}/mythtv" + ALLOW_EMPTY_${PN} = "1" QMAKE_PROFILES = "mythtv.pro" -SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2 \ +SRC_URI += " \ file://configure.patch;patch=1 \ " -S = "${WORKDIR}/mythtv-0.22" - inherit qmake2 qt4x11 EXTRA_MYTHTVCONF_armv7a = "--cpu=cortex-a8" -- cgit v1.2.3 From 3a3cfc7e061bca6e83850e52082aaf6c26e1a2e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 2 Jan 2010 16:49:33 +0100 Subject: libxml-dom-perl: do not RDEPENDS on native stuff --- recipes/perl/libxml-dom-perl_1.44.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/perl/libxml-dom-perl_1.44.bb b/recipes/perl/libxml-dom-perl_1.44.bb index 2c7b45e6b3..35f1312baa 100644 --- a/recipes/perl/libxml-dom-perl_1.44.bb +++ b/recipes/perl/libxml-dom-perl_1.44.bb @@ -1,17 +1,15 @@ DESCRIPTION = "XML::DOM - A perl module for building DOM Level 1 compliant document structures" SECTION = "libs" LICENSE = "unknown" -PR= "r1" +PR= "r2" -RDEPENDS += "libxml-parser-perl-native libxml-regexp-perl-native \ +DEPENDS += "libxml-parser-perl-native libxml-regexp-perl-native \ libhtml-parser-perl-native libhtml-tagset-perl-native \ liburi-perl-native libwww-perl-native" RDEPENDS += "libxml-parser-perl libxml-regexp-perl \ libhtml-parser-perl libhtml-tagset-perl liburi-perl libwww-perl" -PR = "r0" - SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TJ/TJMATHER/XML-DOM-${PV}.tar.gz" S = "${WORKDIR}/XML-DOM-${PV}" -- cgit v1.2.3