Skip to contentSkip to conversation

fuse: add version 2.8.5

PATCH In review Otavio Salvador 2 participants 15 messages May 9, 2011 – May 12, 2011

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/12 fuse: add version 2.8.5

This recipes is required by ntfs-3g-ntfsprogs.

---
 meta-oe/recipes-support/fuse/fuse_2.8.5.bb |   34 ++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/fuse/fuse_2.8.5.bb
meta-oe/recipes-support/fuse/fuse_2.8.5.bb new file +34 -0
new file mode 100644
index 0000000..65b114b
@@ -0,0 +1,34 @@
+DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
+HOMEPAGE = "http://fuse.sf.net"
+SECTION = "libs"
+LICENSE = "GPLv2&LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "8aa2fd689de00b73963620483084ae3b"
+SRC_URI[sha256sum] = "bec80e66ae8ee60dfdf67b2ca291266a45dcfe6bc20c64f3acfceaa38ed29a84"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-kernel-module"
+
+PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
+
+RRECOMMENDS_${PN} = "kernel-module-fuse""
+
+FILES_${PN} += "${libdir}/libfuse.so.*"
+FILES_${PN}-dev += "${libdir}/libfuse*.la"
+
+FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
+FILES_libulockmgr-dev += "${libdir}/libulock*.la"
+FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
+
+# Forbid auto-renaming to libfuse-utils
+FILES_fuse-utils = "${bindir} ${base_sbindir}"
+FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
+DEBIAN_NOAUTONAME_fuse-utils = "1"
+DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
Signature · 1 line
1.7.2.5
#1 lore raw

PATCH v4 2/12 ntfs-3g-ntfsprogs: add version 2011.4.12

This recipe is a merge of ntfs-3g and ntfsprogs thus the provides entries.

---
 .../ntfs-3g-ntfsprogs_2011.4.12.bb                 |   27 ++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb
meta-oe/recipes-support/ntfs-3g-ntfsprogs/ntfs-3g-ntfsprogs_2011.4.12.bb new file +27 -0
new file mode 100644
index 0000000..db5686e
@@ -0,0 +1,27 @@
+DESCRIPTION = "The NTFS-3G driver is an open source, freely available NTFS driver for Linux with read and write support."
+HOMEPAGE = "http://www.ntfs-3g.org/"
+DEPENDS = "fuse libgcrypt"
+PROVIDES = "ntfsprogs ntfs-3g"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+                    file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
+PR = "r0"
+
+SRC_URI = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${PV}.tgz"
+S = "${WORKDIR}/ntfs-3g_ntfsprogs-${PV}"
+
+SRC_URI[md5sum] = "9c4ce318373b15332239a77a9d2a39fe"
+SRC_URI[sha256sum] = "aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05"
+
+inherit autotools
+
+# required or it calls ldconfig at install step
+EXTRA_OEMAKE = "LDCONFIG=echo"
+
+PACKAGES =+ "ntfs-3g ntfsprogs libntfs-3g"
+
+FILES_ntfs-3g = "${base_sbindir}/*.ntfs-3g ${bindir}/ntfs-3g*"
+RDEPENDS_ntfs-3g += "fuse"
+
+FILES_ntfsprogs = "${base_sbindir}/* ${bindir}/* ${sbindir}/*"
+FILES_libntfs-3g = "${libdir}/*${SOLIBS}"
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH v4 3/12 setxkbmap: add version 1.2.0

In reply to Otavio Salvador

This is in sync with OE at 6e7e35679200cd55264fae308cd5dec7ef2d1d29.

---
 .../recipes-graphics/xorg-app/setxkbmap_1.2.0.bb   |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb
meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb new file +8 -0
new file mode 100644
index 0000000..2d153e4
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"
+DEPENDS += " libxkbfile"
+PE = "1"
+PR = "${INC_PR}.0"
+
+SRC_URI[archive.md5sum] = "2f6df89201eb9a2cbfb905d6b82a191e"
+SRC_URI[archive.sha256sum] = "999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39"
Signature · 1 line
1.7.2.5
#3 lore raw

Re: [meta-oe][PATCH v4 03/12] setxkbmap: add version 1.2.0

On Mon, May 9, 2011 at 16:16, Otavio Salvador <[email protected]> wrote:
...

meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb line 2

Quoted 2 lines
meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb new file +2 -0
+require xorg-app-common.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=22c34ea36136407a77702a8b784f9bd0"

...

This one failed on build test and a fixed one will be send later.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#4 lore raw

PATCH v4 4/12 freerdp: add recipe based on GIT from 2009-03-29

In reply to Otavio Salvador
---
 meta-oe/recipes-support/freerdp/freerdp.inc    |   24 ++++++++++++++++++++++++
 meta-oe/recipes-support/freerdp/freerdp_git.bb |   15 +++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/freerdp/freerdp.inc
 create mode 100644 meta-oe/recipes-support/freerdp/freerdp_git.bb
meta-oe/recipes-support/freerdp/freerdp.inc new file +24 -0
new file mode 100644
index 0000000..f8402c7
@@ -0,0 +1,24 @@
+# Copyright (C) 2010, 2011 O.S. Systems Software Ltda. All Rights Reserved
+# Released under the MIT license
+
+DESCRIPTION = "FreeRDP RDP client"
+HOMEPAGE = "http://freerdp.sourceforge.net"
+DEPENDS = "virtual/libx11 openssl libxcursor cups alsa-lib"
+SECTION = "x11/network"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+INC_PR = "r0"
+
+inherit pkgconfig autotools
+
+do_configure_prepend() {
+	# workaround gcc linking bug
+	find ${S} -name 'Makefile.am' | xargs -n 1 sed 's,-pthread,-lpthread -D_REENTRANT,g' -i
+}
+
+do_install_append() {
+	rm ${D}${libdir}/freerdp/*.a ${D}${libdir}/freerdp/*.la
+}
+
+RDEPENDS_${PN} += "xprop"
meta-oe/recipes-support/freerdp/freerdp_git.bb new file +15 -0
new file mode 100644
index 0000000..fa4ba9a
@@ -0,0 +1,15 @@
+# Copyright (C) 2010, 2011, O.S. Systems Software Ltda.
+# Released under the MIT license
+
+include freerdp.inc
+
+inherit gitpkgv
+
+PV = "gitr${SRCPV}"
+PKGV = "${GITPKGVTAG}"
+PR = "${INC_PR}.0"
+
+SRCREV = "7bbde4fb3bc3a781364d0a626c49bc165cc507fd"
+SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;protocol=git"
+
+S = "${WORKDIR}/git"
Signature · 1 line
1.7.2.5
#5 lore raw

PATCH v4 5/12 pixman.inc: use Xorg mirror

In reply to Otavio Salvador
---
 meta-oe/recipes-graphics/xorg-lib/pixman.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-oe/recipes-graphics/xorg-lib/pixman.inc +1 -1
index 539a33a..5661fae 100644
@@ -7,7 +7,7 @@ DEPENDS = "perl-native"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI = "http://cairographics.org/releases/${BPN}-${PV}.tar.gz;name=archive "
+SRC_URI = "${XORG_MIRROR}/individual/lib/${BPN}-${PV}.tar.gz;name=archive "
 
 INC_PR = "r5"
 
Signature · 1 line
1.7.2.5
#6 lore raw

PATCH v4 6/12 p910nd: add version 0.95

In reply to Otavio Salvador
---
 meta-oe/recipes-support/p910nd/p910nd_0.95.bb |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/p910nd/p910nd_0.95.bb
meta-oe/recipes-support/p910nd/p910nd_0.95.bb new file +22 -0
new file mode 100644
index 0000000..5ded564
@@ -0,0 +1,22 @@
+DESCRIPTION = "A small network printer daemon for embedded situations that passes the job directly to the printer"
+HOMEPAGE = "http://p910nd.sourceforge.net/"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/p910nd/p910nd-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "c7ac6afdf7730ac8387a8e87198d4491"
+SRC_URI[sha256sum] = "7d78642c86dc247fbdef1ff85c56629dcdc6b2a457c786420299e284fffcb029"
+
+do_compile () {
+	${CC} ${CFLAGS} ${LDFLAGS} -o p910nd p910nd.c
+}
+
+# The avahi stuff makes it work with bonjour printing
+do_install () {
+	install -D -m 0755 ${S}/p910nd ${D}${sbindir}/p910nd
+	install -D -m 0644 ${S}/p910nd.conf ${D}${sysconfdir}/p910nd.conf
+}
Signature · 1 line
1.7.2.5
#7 lore raw

PATCH v4 7/12 libiconv: drop hack since gettext was being inherited

In reply to Otavio Salvador
---
 .../recipes-support/libiconv/libiconv_1.13.1.bb    |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb +1 -4
index 4db70cb..868314b 100644
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 BBCLASSEXTEND = "native nativesdk"
 
 PROVIDES = "virtual/libiconv"
-PR = "r1"
-
-#gettext.class cant be inherit here so use this hack
-DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+PR = "r2"
 
 EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
 
Signature · 1 line
1.7.2.5
#8 lore raw

Re: [meta-oe][PATCH v4 07/12] libiconv: drop hack since gettext was being inherited

Quoted 19 lines · Otavio Salvador

---
 .../recipes-support/libiconv/libiconv_1.13.1.bb    |    5 +----

 1 files changed, 1 insertions(+), 4 deletions(-)
meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb +0 -0
index 4db70cb..868314b 100644
@@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \

 BBCLASSEXTEND = "native nativesdk"

 PROVIDES = "virtual/libiconv"

meta-oe/recipes-support/libiconv/libiconv_1.13.1.bb +1 -4
-PR = "r1"
-
-#gettext.class cant be inherit here so use this hack
-DEPENDS = "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+PR = "r2"
Quoted 2 lines

 EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"

even this setting of EXTRA_OECONF can be dropped since --enable-nls and --disable-nls are also taken care by gettext bbclass

Quoted 9 lines

--
1.7.2.5

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#9 lore raw

Re: [meta-oe][PATCH v4 07/12] libiconv: drop hack since gettext was being inherited

On Wed, May 11, 2011 at 01:29, Khem Raj <[email protected]> wrote:
...

Quoted 5 lines
Quoted 2 lines

 EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"

even this setting of EXTRA_OECONF can be dropped since --enable-nls and --disable-nls are also taken care by gettext bbclass

It has already been merged but I queued up a patch for this, on my new pull request ... but will wait to have more changes to send it.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#10 lore raw

PATCH v4 8/12 libinih: add git recipe

In reply to Otavio Salvador
---
 meta-oe/recipes-support/inih/libinih_git.bb |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/inih/libinih_git.bb
meta-oe/recipes-support/inih/libinih_git.bb new file +20 -0
new file mode 100644
index 0000000..4807bc7
@@ -0,0 +1,20 @@
+DESCRIPTION = "C and C++ INI Library"
+HOMEPAGE = "http://code.google.com/p/inih/"
+PRIORITY = "optional"
+PV = "0.0+gitr${SRCPV}"
+PKGV = "${GITPKGVTAG}"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde"
+
+PR = "r0"
+
+# The github repository provides a cmake and pkg-config integration
+SRCREV = "715cb4dc3d56714d7d53dcd94ae4b41c950119a7"
+SRC_URI = "git://github.com/OSSystems/inih.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit gitpkgv cmake
+
+# We don't have libinih since we only have static libraries
+ALLOW_EMPTY_${PN} = "1"
Signature · 1 line
1.7.2.5
#11 lore raw

PATCH v4 9/12 qt4: drop 4.6 versions

In reply to Otavio Salvador
---
 ...detection-and-initial-blend-function-.patch.swp |  Bin 16384 -> 0 bytes
 meta-oe/recipes-qt/qt4/qt-4.6.3.inc                |   56 ------------
 .../0006-freetype-host-includes.patch              |   20 -----
 .../qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch |   32 -------
 .../0010-no-simpledecoration-example.patch         |   11 ---
 .../recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf   |   54 ------------
 meta-oe/recipes-qt/qt4/qt4-embedded_4.6.3.bb       |    9 --
 meta-oe/recipes-qt/qt4/qt4-tools-native_4.6.3.bb   |   11 ---
 .../recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb    |    6 --
 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb      |   90 --------------------
 .../recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf   |   54 ------------
 meta-oe/recipes-qt/qt4/qt4-x11-free_4.6.3.bb       |    6 --
 12 files changed, 0 insertions(+), 349 deletions(-)
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp
 delete mode 100644 meta-oe/recipes-qt/qt4/qt-4.6.3.inc
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-embedded_4.6.3.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-native_4.6.3.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf
 delete mode 100644 meta-oe/recipes-qt/qt4/qt4-x11-free_4.6.3.bb
meta-oe/recipes-qt/qt4/qt-4.6.0/.1165-NEON-configure-detection-and-initial-blend-function-.patch.swp deleted binary +0 -0
deleted file mode 100644
index 5a11254f65420e59bfc4e9ebaf0ee32b12638a2c..0000000000000000000000000000000000000000
GIT binary patch
meta-oe/recipes-qt/qt4/qt-4.6.3.inc deleted +0 -56

56 lines not on this page · raw message

meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0006-freetype-host-includes.patch deleted +0 -20
deleted file mode 100644
index 987c425..0000000
@@ -1,20 +0,0 @@
-From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
-From: Michael Krelin <[email protected]>
-Date: Mon, 4 Jun 2007 14:48:50 +0200
-Subject: [PATCH] freetype host includes
-
----
- config.tests/unix/freetype/freetype.pri |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
-===================================================================
---- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
-+++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
-@@ -1,5 +1,5 @@
- !cross_compile {
--    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-+    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     # LSB doesn't allow using headers from /include or /usr/include
-     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
-     for(p, TRY_INCLUDEPATHS) {
meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0008-qt-lib-infix.patch deleted +0 -32
deleted file mode 100644
index 61e60a0..0000000
@@ -1,32 +0,0 @@
---- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100
-@@ -3,11 +3,11 @@
- 
- # Include the correct version of the UiLoader library
- symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
--else: QTUITOOLS_LINKAGE = -lQtUiTools
-+else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
- 
- CONFIG(debug, debug|release) {
--    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
--    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
-+    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
-+    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
- }
- LIBS += $$QTUITOOLS_LINKAGE
- 
---- /tmp/uitools.pro	2009-12-01 18:40:28.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro	2009-12-01 18:59:18.000000000 +0100
-@@ -1,5 +1,5 @@
- TEMPLATE = lib
--TARGET = $$qtLibraryTarget(QtUiTools)
-+TARGET = QtUiTools
- QT += xml
- CONFIG += qt staticlib
- DESTDIR = ../../../../lib
-@@ -43,3 +43,5 @@
-    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-    QMAKE_PKGCONFIG_REQUIRES += QtXml
- }
-+
-+TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/0010-no-simpledecoration-example.patch deleted +0 -11
deleted file mode 100644
index fce5bba..0000000
@@ -1,11 +0,0 @@
---- /tmp/qws.pro	2009-12-10 19:30:08.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro	2009-12-10 19:30:21.000000000 +0100
-@@ -1,7 +1,7 @@
- TEMPLATE      = subdirs
- # no /dev/fbX
- !qnx:!vxworks:SUBDIRS = framebuffer
--SUBDIRS      += mousecalibration simpledecoration
-+SUBDIRS      += mousecalibration
- 
- # install
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
meta-oe/recipes-qt/qt4/qt4-embedded-4.6.3/linux.conf deleted +0 -54

54 lines not on this page · raw message

meta-oe/recipes-qt/qt4/qt4-embedded_4.6.3.bb deleted +0 -9
deleted file mode 100644
index dd662aa..0000000
@@ -1,9 +0,0 @@
-require qt-${PV}.inc
-require qt4-embedded.inc
-
-SRC_URI += "file://qthelp-lib-qtclucene.patch"
-
-PR = "${INC_PR}.1"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
meta-oe/recipes-qt/qt4/qt4-tools-native_4.6.3.bb deleted +0 -11
deleted file mode 100644
index dae8cd1..0000000
@@ -1,11 +0,0 @@
-require qt4-tools-native.inc
-
-PR = "${INC_PR}.0"
-
-EXTRA_OECONF += " -no-fast -silent -no-rpath"
-
-TOBUILD := "src/tools/bootstrap ${TOBUILD}"
-
-SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
-SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
-
meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.6.3.bb deleted +0 -6
deleted file mode 100644
index d64542b..0000000
@@ -1,6 +0,0 @@
-require qt4-tools-nativesdk.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "5c69f16d452b0bb3d44bc3c10556c072"
-SRC_URI[sha256sum] = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"
meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.6.3.bb deleted +0 -90

90 lines not on this page · raw message

meta-oe/recipes-qt/qt4/qt4-x11-free-4.6.3/linux.conf deleted +0 -54

54 lines not on this page · raw message

meta-oe/recipes-qt/qt4/qt4-x11-free_4.6.3.bb deleted +0 -6
deleted file mode 100644
index 8cf5449..0000000
@@ -1,6 +0,0 @@
-require qt-${PV}.inc
-require qt4-x11-free.inc
-
-PR = "${INC_PR}.0"
-
-QT_CONFIG_FLAGS += " -xrandr "
Signature · 1 line
1.7.2.5
#12 lore raw

PATCH v4 10/12 postgresql: update to 8.4.7 since 8.4.4 was unfetchable

In reply to Otavio Salvador

This has been synced with postgresql recipes in OE.

---
 .../remove.autoconf.version.check.patch            |   15 ---------------
 .../remove.autoconf.version.check.patch            |   15 +++++++++++++++
 meta-oe/recipes-support/postgresql/postgresql.inc  |    6 ++++--
 .../recipes-support/postgresql/postgresql_8.4.4.bb |   11 -----------
 .../recipes-support/postgresql/postgresql_8.4.7.bb |   10 ++++++++++
 5 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch
 create mode 100644 meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch
 delete mode 100644 meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb
 create mode 100644 meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb
meta-oe/recipes-support/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch deleted +0 -15
deleted file mode 100644
index d027061..0000000
@@ -1,15 +0,0 @@
-Index: postgresql-8.4.4/configure.in
-===================================================================
---- postgresql-8.4.4.orig/configure.in
-+++ postgresql-8.4.4/configure.in
-@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
- 
- AC_INIT([PostgreSQL], [8.4.4], [[email protected]])
- 
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended.  You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
meta-oe/recipes-support/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch new file +15 -0
new file mode 100644
index 0000000..514a9aa
@@ -0,0 +1,15 @@
+Index: postgresql-8.4.7/configure.in
+===================================================================
+--- postgresql-8.4.7.orig/configure.in
++++ postgresql-8.4.7/configure.in
+@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
+ 
+ AC_INIT([PostgreSQL], [8.4.7], [[email protected]])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
meta-oe/recipes-support/postgresql/postgresql.inc +4 -2
index edad3bc..53c38df 100644
@@ -1,14 +1,14 @@
 DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
 HOMEPAGE = "http://www.postgresql.com"
 LICENSE = "BSD"
-
 DEPENDS = "zlib readline tzcode-native"
+INC_PR = "r5"
 
 ARM_INSTRUCTION_SET = "arm"
 
 #WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
 
-SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
+SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
 
 LEAD_SONAME = "libpq.so"
 
@@ -17,6 +17,8 @@ export LDFLAGS_SL = "${LDFLAGS}"
 
 inherit autotools pkgconfig
 
+EXTRA_OECONF_sh4 = "--disable-spinlocks"
+
 do_compile_append() {
          cp /usr/sbin/zic ${S}/src/timezone/
 }
meta-oe/recipes-support/postgresql/postgresql_8.4.4.bb deleted +0 -11
deleted file mode 100644
index d0f5078..0000000
@@ -1,11 +0,0 @@
-require postgresql.inc
-
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=29b81b066680be9ffd98cb9d2afb9de6"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2 \
-           file://remove.autoconf.version.check.patch"
-
-SRC_URI[md5sum] = "4bf2448ad965bca3940df648c02194df"
-SRC_URI[sha256sum] = "e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e"
meta-oe/recipes-support/postgresql/postgresql_8.4.7.bb new file +10 -0
new file mode 100644
index 0000000..63f324c
@@ -0,0 +1,10 @@
+require postgresql.inc
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=29b81b066680be9ffd98cb9d2afb9de6"
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://remove.autoconf.version.check.patch"
+
+SRC_URI[md5sum] = "689397187bb1dfe9b5cbde99538311c3"
+SRC_URI[sha256sum] = "08032849da121e67e318f7ff4e68d3ac88f29050e242641f717c4270839b597b"
Signature · 1 line
1.7.2.5
#13 lore raw

PATCH v4 11/12 qt4: fix 4.7.2 checksum

In reply to Otavio Salvador
---
 meta-oe/recipes-qt/qt4/qt-4.7.2.inc                |    4 ++--
 meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb   |    4 ++--
 .../recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb    |    4 ++--
 meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb      |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
meta-oe/recipes-qt/qt4/qt-4.7.2.inc +2 -2
index 70ee596..ed62bd3 100644
@@ -14,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
            file://linux.conf \
            "
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
 
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
meta-oe/recipes-qt/qt4/qt4-tools-native_4.7.2.bb +2 -2
index e9de510..d3c0eda 100644
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
 
 TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
meta-oe/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb +2 -2
index 091a539..a917ac4 100644
@@ -2,5 +2,5 @@ require qt4-tools-nativesdk.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
meta-oe/recipes-qt/qt4/qt4-tools-sdk_4.7.2.bb +2 -2
index 1018f74..c86ac2a 100644
@@ -4,5 +4,5 @@ PR = "${INC_PR}.0"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI[md5sum] = "6f88d96507c84e9fea5bf3a71ebeb6d7"
-SRC_URI[sha256sum] = "8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a"
+SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb"
+SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336"
Signature · 1 line
1.7.2.5
#14 lore raw

PATCH v4 12/12 qmake_base.bbclass: sync with oe-core class

In reply to Otavio Salvador
---
 meta-oe/classes/qmake_base.bbclass |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
meta-oe/classes/qmake_base.bbclass +20 -6
index 577c0fa..654c7c8 100644
@@ -1,6 +1,6 @@
 
 OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
-QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
+QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
 
 # We override this completely to eliminate the -e normally passed in
 EXTRA_OEMAKE = ' MAKEFLAGS= '
@@ -34,6 +34,20 @@ oe_qmake_mkspecs () {
     done
 }
 
+do_generate_qt_config_file() {
+	export QT_CONF_PATH=${WORKDIR}/qt.conf
+	cat > ${WORKDIR}/qt.conf <<EOF
+[Paths]
+Prefix = ${STAGING_DIR}
+Binaries = ${BUILD_SYS}${bindir_native}
+Headers = ${MACHINE}${prefix}/include/qt4
+Plugins = ${MACHINE}${prefix}/lib/qt4/plugins/
+Mkspecs = ${MACHINE}${prefix}/share/qt4/mkspecs/
+EOF
+}
+
+addtask generate_qt_config_file after do_patch before do_configure
+
 qmake_base_do_configure() {
 	case ${QMAKESPEC} in
 	*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++)
@@ -42,7 +56,7 @@ qmake_base_do_configure() {
 		die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
 		;;
 	*)
-		oenote Searching for qmake spec file
+		bbnote Searching for qmake spec file
 		paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
 		paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
 
@@ -58,7 +72,7 @@ qmake_base_do_configure() {
 		;;
 	esac
 
-	oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
+	bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
 
 	if [ -z "${QMAKE_PROFILES}" ]; then 
 		PROFILES="`ls *.pro`"
@@ -73,15 +87,15 @@ qmake_base_do_configure() {
 	if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
 		AFTER="-after"
 		QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
-		oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
+		bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
 	fi
 
 	if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
 		QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
-		oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
+		bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
 	fi
 
-#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
+#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
 	unset QMAKESPEC || true
 	${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
 }
Signature · 1 line
1.7.2.5