From 415dfbd35c8e60a40fe362f1bed0d52e6d7a8d70 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 27 Apr 2006 23:23:39 +0000 Subject: ftpd-topfield: Updated to 0.6.6 --- packages/ftpd-topfield/files/init | 2 +- packages/ftpd-topfield/ftpd-topfield_0.6.3.bb | 35 --------------------------- packages/ftpd-topfield/ftpd-topfield_0.6.6.bb | 35 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 36 deletions(-) delete mode 100755 packages/ftpd-topfield/ftpd-topfield_0.6.3.bb create mode 100755 packages/ftpd-topfield/ftpd-topfield_0.6.6.bb (limited to 'packages') diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init index 0816e8bb7d..aabd3d40fc 100644 --- a/packages/ftpd-topfield/files/init +++ b/packages/ftpd-topfield/files/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/ftpd-topfield NAME=ftpd-topfield DESC="FTP daemon for the Topfield PVR" -ARGS="-D -P 21 -e" +ARGS="-D -P 21" test -f $DAEMON || exit 0 diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb deleted file mode 100755 index 72cf5ab057..0000000000 --- a/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb +++ /dev/null @@ -1,35 +0,0 @@ -# This package builds the ftpd-topfield program -PR = "r0" -DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" -HOMEPAGE = "http://sourceforge.net/projects/puppy" -MAINTAINER = "NSLU2 Linux " -SECTION = "net" -LICENSE = "MIT" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_3 \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_3 \ - file://init" - -# The source will end up in the subdirectory 'ftpd-topfield' - no release name -S = "${WORKDIR}/ftpd-topfield" - -inherit update-rc.d - -INITSCRIPT_NAME = "ftpd-topfield" -INITSCRIPT_PARAMS = "defaults" - -# Just the one package at present -PACKAGES = "${PN}" - -inherit autotools - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield -} diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb new file mode 100755 index 0000000000..f7fdfb5466 --- /dev/null +++ b/packages/ftpd-topfield/ftpd-topfield_0.6.6.bb @@ -0,0 +1,35 @@ +# This package builds the ftpd-topfield program +PR = "r0" +DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" +HOMEPAGE = "http://sourceforge.net/projects/puppy" +MAINTAINER = "NSLU2 Linux " +SECTION = "net" +LICENSE = "MIT" + +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_6 \ + cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_6 \ + file://init" + +# The source will end up in the subdirectory 'ftpd-topfield' - no release name +S = "${WORKDIR}/ftpd-topfield" + +inherit update-rc.d + +INITSCRIPT_NAME = "ftpd-topfield" +INITSCRIPT_PARAMS = "defaults" + +# Just the one package at present +PACKAGES = "${PN}" + +inherit autotools + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield +} -- cgit v1.2.3 From 101afde2841e3c110181ad4c71bb0cbeae0f1fa1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 May 2006 18:58:46 +0000 Subject: glib: update to 2.8.4 --- packages/glib-2.0/glib-2.0_2.8.4.bb | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0_2.8.4.bb (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb new file mode 100644 index 0000000000..d660b61c06 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.8.4.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r1" + +LEAD_SONAME = "libglib-2.0.*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + autotools_stage_all + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} -- cgit v1.2.3 From 1d58c916264c6d87021435329b30108cab9819e7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 May 2006 19:50:43 +0000 Subject: freetype 2.1.10: apply patch to fix rpath abuse, courtesy Phil Blundell --- packages/freetype/files/no-hardcode.patch | 11 +++++++++++ packages/freetype/freetype_2.1.10.bb | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/freetype/files/no-hardcode.patch (limited to 'packages') diff --git a/packages/freetype/files/no-hardcode.patch b/packages/freetype/files/no-hardcode.patch new file mode 100644 index 0000000000..44ae450a14 --- /dev/null +++ b/packages/freetype/files/no-hardcode.patch @@ -0,0 +1,11 @@ +--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 ++++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir=@libdir@ + enable_shared=@enable_shared@ + wl=@wl@ +-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' ++hardcode_libdir_flag_spec='' + + usage() + { diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb index 772b316cc8..35c0d0cbd6 100644 --- a/packages/freetype/freetype_2.1.10.bb +++ b/packages/freetype/freetype_2.1.10.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library" HOMEPAGE = "http://www.freetype.org" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig -- cgit v1.2.3 From b0001466290c332ff1720a5ed3763511826e4167 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 07:10:34 +0000 Subject: libcroco: update to 0.6.1 --- packages/libcroco/libcroco_0.6.1.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/libcroco/libcroco_0.6.1.bb (limited to 'packages') diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb new file mode 100644 index 0000000000..d5553cf138 --- /dev/null +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" +SECTION = "x11/utils" +MAINTAINER = "Koen Kooi " +DEPENDS = "glib-2.0 libxml2" +LICENSE = "LGPL" +PR = "r0" + +inherit autotools pkgconfig gnome + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From f6bb411f9a58f8b13a2b273f6b101c4cd7b005f0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 May 2006 09:58:58 +0000 Subject: gnuz: fixed levels - close #835 --- packages/gnuz/gnuz_0.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb index 54056d7a8a..9a164978ff 100644 --- a/packages/gnuz/gnuz_0.3.bb +++ b/packages/gnuz/gnuz_0.3.bb @@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz " LICENSE = "GPL" AUTHOR = "Lukas Fraser" HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/" -PR = "r1" +PR = "r2" APPTYPE = "binary" APPNAME = "gnuz" APPDESKTOP = "${S}/data/" SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \ - http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2" + http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2" S = "${WORKDIR}/gnuz" -- cgit v1.2.3 From e64c00e3dea991e7a540afa4b5974b2bdd14c9ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 18:04:41 +0000 Subject: libcroco: fix staging --- packages/libcroco/libcroco_0.6.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb index d5553cf138..d92987adf3 100644 --- a/packages/libcroco/libcroco_0.6.1.bb +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -3,10 +3,13 @@ SECTION = "x11/utils" MAINTAINER = "Koen Kooi " DEPENDS = "glib-2.0 libxml2" LICENSE = "LGPL" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gnome do_stage() { - autotools_stage_all + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libcroco + install -m 644 src/*.h ${STAGING_INCDIR}/libcroco/ + install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/ } -- cgit v1.2.3 From 9c6456bf405f2c84166d0557155c294faed51c96 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 May 2006 19:37:56 +0000 Subject: linux-openzaurus: added 2 MMC patches from RMK - should help with timeouts a bit --- .../linux/linux-openzaurus-2.6.16/rmk-mmc1.patch | 61 ++++++++++++++++++++++ .../linux/linux-openzaurus-2.6.16/rmk-mmc2.patch | 26 +++++++++ packages/linux/linux-openzaurus_2.6.16.bb | 4 +- 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch create mode 100644 packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch (limited to 'packages') diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch new file mode 100644 index 0000000000..054b48d28d --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch @@ -0,0 +1,61 @@ + +The CSD contains a "read2write factor" which determines the multiplier to +be applied to the read timeout to obtain the write timeout. We were +ignoring this parameter, resulting in the possibility for writes being +timed out too early. + +Signed-off-by: Russell King + +diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c +--- a/drivers/mmc/mmc.c ++++ b/drivers/mmc/mmc.c +@@ -549,6 +549,7 @@ static void mmc_decode_csd(struct mmc_ca + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); ++ csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); + } else { +@@ -583,6 +584,7 @@ static void mmc_decode_csd(struct mmc_ca + csd->read_partial = UNSTUFF_BITS(resp, 79, 1); + csd->write_misalign = UNSTUFF_BITS(resp, 78, 1); + csd->read_misalign = UNSTUFF_BITS(resp, 77, 1); ++ csd->r2w_factor = UNSTUFF_BITS(resp, 26, 3); + csd->write_blkbits = UNSTUFF_BITS(resp, 22, 4); + csd->write_partial = UNSTUFF_BITS(resp, 21, 1); + } +diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c +--- a/drivers/mmc/mmc_block.c ++++ b/drivers/mmc/mmc_block.c +@@ -187,6 +187,12 @@ static int mmc_blk_issue_rq(struct mmc_q + brq.cmd.opcode = MMC_WRITE_BLOCK; + brq.data.flags |= MMC_DATA_WRITE; + brq.data.blocks = 1; ++ ++ /* ++ * Scale up the timeout by the r2w factor ++ */ ++ brq.data.timeout_ns <<= card->csd.r2w_factor; ++ brq.data.timeout_clks <<= card->csd.r2w_factor; + } + + if (brq.data.blocks > 1) { +diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h +--- a/include/linux/mmc/card.h ++++ b/include/linux/mmc/card.h +@@ -28,6 +28,7 @@ struct mmc_csd { + unsigned short cmdclass; + unsigned short tacc_clks; + unsigned int tacc_ns; ++ unsigned int r2w_factor; + unsigned int max_dtr; + unsigned int read_blkbits; + unsigned int write_blkbits; + + +------------------------------------------------------------------- +List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel +FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php +Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php + diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch new file mode 100644 index 0000000000..cef02436d6 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch @@ -0,0 +1,26 @@ + +Always send a stop command at the end of a data transfer. If we avoid +sending the stop command, some cards remain in data transfer mode, and +refuse to accept further read/write commands. + +Signed-off-by: Russell King + +diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c +--- a/drivers/mmc/pxamci.c ++++ b/drivers/mmc/pxamci.c +@@ -291,7 +291,7 @@ static int pxamci_data_done(struct pxamc + pxamci_disable_irq(host, DATA_TRAN_DONE); + + host->data = NULL; +- if (host->mrq->stop && data->error == MMC_ERR_NONE) { ++ if (host->mrq->stop) { + pxamci_stop_clock(host); + pxamci_start_cmd(host, host->mrq->stop, 0); + } else { + + +------------------------------------------------------------------- +List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel +FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php +Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php + diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index b62bcba688..ad293b82b3 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r15" +PR = "r19" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -13,6 +13,8 @@ PR = "r15" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ + file://rmk-mmc1.patch;patch=1 \ + file://rmk-mmc2.patch;patch=1 \ ${RPSRC}/led_core-r15.patch;patch=1 \ ${RPSRC}/led_triggers-r14.patch;patch=1 \ ${RPSRC}/led_trig_timer-r8.patch;patch=1 \ -- cgit v1.2.3 From 11380e391e5e9e470a4bfd3fa152d592e41dbfa8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 2 May 2006 20:23:36 +0000 Subject: qt4: improve packaging --- packages/qt/qt4-x11-free_4.1.1.bb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/qt/qt4-x11-free_4.1.1.bb b/packages/qt/qt4-x11-free_4.1.1.bb index 1d365c3b01..7a4874c83a 100644 --- a/packages/qt/qt4-x11-free_4.1.1.bb +++ b/packages/qt/qt4-x11-free_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r4" +PR = "r5" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://cross-compile.patch;patch=1 \ @@ -30,7 +30,6 @@ EXTRA_OEMAKE = "-e" # FIXME: # * add missing options -# * auto stl detection is broken, so we disable it QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ -nosse \ @@ -76,6 +75,7 @@ do_stage() { } # FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... do_install() { install -d ${D}${libdir} install -d ${D}${bindir} @@ -101,10 +101,14 @@ do_install() { } PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ - libqtdesigner4 libqtdesignercomponents4 \ + libqtdesigner4 libqtdesignercomponents4 libqt3support4 \ qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" +ALLOW_EMPTY = "1" +FILES_${PN} = "" +RDEPENDS_${PN} = "${PACKAGES}" + FILES_libqtcore4 = "${libdir}/libQtCore.so*" FILES_libqtgui4 = "${libdir}/libQtGui.so*" FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" @@ -114,6 +118,7 @@ FILES_libqttest4 = "${libdir}/libQtTest.so*" FILES_libqtxml4 = "${libdir}/libQtXml.so*" FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" +FILES_libqt3support4 = "${libdir}/libQt3Support.so*" FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" @@ -128,3 +133,6 @@ FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bind FILES_qt4-common = "${bindir}/qtconfig" FILES_qt4-examples = "${bindir}/qt4-examples/*" FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" -- cgit v1.2.3 From 41603de51b5a8f0ec408a994533fbf685f4f28fc Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 2 May 2006 21:16:05 +0000 Subject: pyqt4: make packaging more standard --- packages/python/python-pyqt4/optional-features.patch | 5 ++--- packages/python/python-pyqt4_0.9.bb | 11 +++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/python/python-pyqt4/optional-features.patch b/packages/python/python-pyqt4/optional-features.patch index 02a4e80848..032824e39d 100644 --- a/packages/python/python-pyqt4/optional-features.patch +++ b/packages/python/python-pyqt4/optional-features.patch @@ -5,17 +5,16 @@ --- PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip~optional-features.patch +++ PyQt4-gpl-4.0beta1/sip/QtGui/qsessionmanager.sip -@@ -21,7 +21,8 @@ +@@ -21,7 +21,7 @@ // PyQt; see the file LICENSE. If not, write to the Free Software Foundation, // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -+//%Feature SessionManager +%If (SessionManager) class QSessionManager : QObject { %TypeHeaderCode -@@ -58,3 +59,4 @@ +@@ -58,3 +58,4 @@ bool isPhase2() const; void requestPhase2(); }; diff --git a/packages/python/python-pyqt4_0.9.bb b/packages/python/python-pyqt4_0.9.bb index e56d6b36ef..4a52e46f18 100644 --- a/packages/python/python-pyqt4_0.9.bb +++ b/packages/python/python-pyqt4_0.9.bb @@ -8,7 +8,7 @@ LICENSE = "GPL" DEPENDS = "qt4x11" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \ file://cross-compile.patch;patch=1 \ @@ -50,7 +50,7 @@ do_configure_prepend() { do_stage() { install -d ${STAGING_SIPDIR}/qt/ - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages for module in ${SIP_MODULES} do install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ @@ -59,11 +59,14 @@ do_stage() { } do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/ + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 for module in ${SIP_MODULES} do - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so + echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so done + cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ } FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From 58f47eee5f55cada5751b63deaf5ab286eada21e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 09:53:17 +0000 Subject: add imkit, a japanese inputmethod for Opie. in nonworking, because it needs a c++ template syntax patch to comply with modern compilers --- packages/nonworking/imkit/.mtn2git_empty | 0 packages/nonworking/imkit/imkit_0.4.0-pre2.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 packages/nonworking/imkit/.mtn2git_empty create mode 100644 packages/nonworking/imkit/imkit_0.4.0-pre2.bb (limited to 'packages') diff --git a/packages/nonworking/imkit/.mtn2git_empty b/packages/nonworking/imkit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/imkit/imkit_0.4.0-pre2.bb b/packages/nonworking/imkit/imkit_0.4.0-pre2.bb new file mode 100644 index 0000000000..2e809b11c1 --- /dev/null +++ b/packages/nonworking/imkit/imkit_0.4.0-pre2.bb @@ -0,0 +1,20 @@ +# +# nonworking, because the c++ template syntax no longer compiles with modern compilers +# +DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine" +HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en" +SECTION = "opie/inputmethods" +LICENSE = "GPL" +RDEPENDS = "anthy" + +SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/2195/imkit-${PV}.tar.gz" +S = "${WORKDIR}/imkit-${PV}" + +inherit palmtop + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "imkit.pro" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro +} -- cgit v1.2.3 From 5a472649c065482d39a317030734593228ac0258 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 3 May 2006 12:29:24 +0000 Subject: udev: Do not start any NICs before /etc/init.d/network is run and /var/ is populated --- packages/udev/files/network.sh | 29 +++++++++++++++++++++++++ packages/udev/files/udev_network_queue.sh | 35 +++++++++++++++++++++++++++++++ packages/udev/udev_084.bb | 18 +++++++++++++--- 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 packages/udev/files/udev_network_queue.sh (limited to 'packages') diff --git a/packages/udev/files/network.sh b/packages/udev/files/network.sh index 5e2bd5799a..5016328df4 100644 --- a/packages/udev/files/network.sh +++ b/packages/udev/files/network.sh @@ -6,6 +6,35 @@ test -x /sbin/cardctl && exit 0 # We get two "add" events for hostap cards due to wifi0 echo "$INTERFACE" | grep -q wifi && exit 0 + +# Check if /etc/init.d/network has been run yet to see if we are +# called by starting /etc/rcS.d/S03udev and not by hotplugging a device +# +# At this stage, network interfaces should not be brought up +# automatically because: +# a) /etc/init.d/network has not been run yet (security issue) +# b) /var has not been populated yet so /etc/resolv,conf points to +# oblivion, making the network unusable +# + +spoofp="`grep ^spoofprotect /etc/network/options`" +if test -z "$spoofp" +then + # This is the default from /etc/init.d/network + spoofp_val=yes +else + spoofp_val=${spoofp#spoofprotect=} +fi + +test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0 + +# I think it is safe to assume that "lo" will always be there ;) +if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val" +then + echo "$INTERFACE" >> /dev/udev_network_queue + exit 0 +fi + # # Code taken from pcmcia-cs:/etc/pcmcia/network # diff --git a/packages/udev/files/udev_network_queue.sh b/packages/udev/files/udev_network_queue.sh new file mode 100644 index 0000000000..05e08e9d1b --- /dev/null +++ b/packages/udev/files/udev_network_queue.sh @@ -0,0 +1,35 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: udev_network_queue.sh +# Date: 03-May-06 + +do_start() { + if test -e /dev/udev_network_queue + then + echo "Activating queued NICs..." + for NIC in `cat /dev/udev_network_queue` + do + export INTERFACE="$NIC" ; export ACTION=add + /etc/udev/scripts/network.sh + done + echo "" + else + echo "No NICs queued" + fi +} + +do_stop() { + /bin/true +} + +case "$1" in +start) do_start;; +stop) do_stop;; +restart) do_stop + do_start;; +*) echo "Usage: `basename $0` [ start | stop | restart ]" + exit 0;; +esac diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index d42366b992..0bb96c7f36 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -8,13 +8,14 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ - file://mount.blacklist" + file://mount.blacklist \ + file://udev_network_queue.sh" include udev.inc INITSCRIPT_PARAMS = "start 03 S ." -PR = "r11" +PR = "r12" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" @@ -26,7 +27,8 @@ do_install () { oe_runmake 'DESTDIR=${D}' INSTALL=install install install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev - + install -m 0755 ${WORKDIR}/udev_network_queue.sh ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ @@ -46,3 +48,13 @@ do_install () { install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize } + + +pkg_postinst_append() { + update-rc.d -s udev_network_queue.sh start 41 S . start 55 0 6 . +} + + +pkg_postrm_append() { + update-rc.d -f udev_network_queue.sh remove +} -- cgit v1.2.3 From 149ce27ac7bcf6b339221cc2474d4ecd050fdcd2 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 3 May 2006 12:37:12 +0000 Subject: rcS-default: Add VOLATILE_ENABLE_CACHE=yes to /etc/default/rcS --- packages/sysvinit/sysvinit/rcS-default | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit/rcS-default b/packages/sysvinit/sysvinit/rcS-default index 46e48b9796..82bf55970c 100644 --- a/packages/sysvinit/sysvinit/rcS-default +++ b/packages/sysvinit/sysvinit/rcS-default @@ -19,3 +19,5 @@ EDITMOTD=no FSCKFIX=yes # Set TICKADJ to the correct tick value for this specific machine #TICKADJ=10000 +# Enable caching in populate-volatile.sh +VOLATILE_ENABLE_CACHE=yes -- cgit v1.2.3 From 47ce31c955a0f4c800daa8d5546ef03a4e206ebc Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 3 May 2006 12:37:56 +0000 Subject: sysvinit_2.86.bb: Bump PR --- packages/sysvinit/sysvinit_2.86.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index 98cc47bc2a..e2124c7fe9 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" MAINTAINER = "Chris Larson " HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r23" +PR = "r24" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. -- cgit v1.2.3 From 1d95c117acc204d97154c7f8a70ec2400d4cbdbb Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 3 May 2006 12:44:07 +0000 Subject: initscripts: Speed up populate-volatiles.sh by caching the command produced by the script. Run times on an idle system: old version: 7.6s new version: 4.5s (no chache) new version: 0.9s (with cache) --- .../initscripts-1.0/populate-volatile.sh | 63 ++++++++++++++++------ packages/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 47 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index bf498084e4..f22bf2fdfe 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -8,6 +8,35 @@ COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." +create_file() { + EXEC=" + touch \"$1\" + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + + test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache + + eval $EXEC & +} + +mk_dir() { + EXEC=" + mkdir -p \"$1\" + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " + + test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache + + eval $EXEC & +} + +link_file() { + EXEC="test -e \"$2\" -o -L $2 || ln -s \"$1\" \"$2\" >/dev/tty0 2>&1" + + test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache + + eval $EXEC & +} check_requirements() { @@ -72,22 +101,21 @@ apply_cfgfile() { cat ${CFGFILE} | grep -v "^#" | \ while read LINE; do - TTYPE=`echo ${LINE} | cut -d " " -f 1` - TUSER=`echo ${LINE} | cut -d " " -f 2` - TGROUP=`echo ${LINE} | cut -d " " -f 3` - TMODE=`echo ${LINE} | cut -d " " -f 4` - TNAME=`echo ${LINE} | cut -d " " -f 5` + + # This is a hell of a lot faster than using cut or awk 5 times + eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"` [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-." + [ "${TTYPE}" = "l" ] && { [ -e "${TNAME}" ] && { echo "Cannot create link over existing -${TNAME}-." >&2 } || { - TSOURCE=`echo ${LINE} | cut -d " " -f 6` + TSOURCE="$TLTARGET" [ -L "${TNAME}" ] || { [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-." - ln -s "${TSOURCE}" "${TNAME}" + link_file "${TSOURCE}" "${TNAME}" & } } continue @@ -112,10 +140,10 @@ apply_cfgfile() { case "${TTYPE}" in "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." - touch "${TNAME}" + create_file "${TNAME}" & ;; "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." - mkdir -p "${TNAME}" + mk_dir "${TNAME}" & # Add check to see if there's an entry in fstab to mount. ;; *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-." @@ -123,9 +151,6 @@ apply_cfgfile() { ;; esac - chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2 - chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2 - chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2 done @@ -133,8 +158,12 @@ apply_cfgfile() { } - -for file in `ls -1 "${CFGDIR}" | sort`; do - apply_cfgfile "${CFGDIR}/${file}" - done - +if test -e /etc/volatile.cache -a "$VOLATILE_ENABLE_CACHE" = "yes" +then + sh /etc/volatile.cache +else + rm -f /etc/volatile.cache + for file in `ls -1 "${CFGDIR}" | sort`; do + apply_cfgfile "${CFGDIR}/${file}" + done +fi diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 29886d0ac0..b3c0bfb9ab 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r71" +PR = "r72" SRC_URI = "file://halt \ file://ramdisk \ -- cgit v1.2.3 From b7e3e75b864c5b8c5ce472203efc8ef5fea26cca Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 May 2006 13:48:41 +0000 Subject: gpe-themes: add license = gpl --- packages/gpe-themes/gpe-theme-clearlooks_0.2.bb | 4 +++- packages/gpe-themes/gpe-theme-clearlooks_0.3.bb | 4 +++- packages/gpe-themes/gpe-theme-foxbox_0.1.bb | 2 +- packages/gpe-themes/gpe-theme-industrial_0.1.bb | 3 ++- packages/gpe-themes/gpe-theme-industrial_0.2.bb | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index 571ad216e2..dc8f434ecc 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" -MAINTAINER = "Koen Kooi " +MAINTAINER = "Koen Kooi " +LICENSE = "GPL" + PR= "r1" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb index 2da147863a..599abee8b4 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ clearlooks theme adjusted for GPE" -MAINTAINER = "Koen Kooi " +MAINTAINER = "Koen Kooi " +LICENSE = "GPL" + PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb index 3d6e1505fa..6999e87b86 100644 --- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb +++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/foxbox" FILES_${PN} = "${datadir}/themes" -SRC_URI = "http://handhelds.org/~florian/themes/foxbox-${PV}.tar.gz" +SRC_URI = "http://dominion.kabel.utwente.nl/~florian/themes/foxbox-${PV}.tar.gz" diff --git a/packages/gpe-themes/gpe-theme-industrial_0.1.bb b/packages/gpe-themes/gpe-theme-industrial_0.1.bb index ca396778c4..409f6d8a56 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.1.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.1.bb @@ -1,5 +1,6 @@ DESCRIPTION = "GTK+ industrial theme adjusted for GPE" -MAINTAINER = "Koen Kooi " +MAINTAINER = "Koen Kooi " +LICENSE = "GPL" PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it diff --git a/packages/gpe-themes/gpe-theme-industrial_0.2.bb b/packages/gpe-themes/gpe-theme-industrial_0.2.bb index ca396778c4..aaf8e4c435 100644 --- a/packages/gpe-themes/gpe-theme-industrial_0.2.bb +++ b/packages/gpe-themes/gpe-theme-industrial_0.2.bb @@ -1,5 +1,7 @@ DESCRIPTION = "GTK+ industrial theme adjusted for GPE" -MAINTAINER = "Koen Kooi " +MAINTAINER = "Koen Kooi " +LICENSE = "GPL" + PR= "r0" #it doesn't really depends on it, but it's nice to make OE build it -- cgit v1.2.3 From 3e3e20e4a68fcc28363ae83987073ec8e9a296c9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 14:21:23 +0000 Subject: pyqt4: build against Qt 4.1.2 --- packages/python/python-pyqt4_0.9.2.bb | 72 +++++++++++++++++++++++++++++++++++ packages/python/python-pyqt4_0.9.bb | 72 ----------------------------------- 2 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 packages/python/python-pyqt4_0.9.2.bb delete mode 100644 packages/python/python-pyqt4_0.9.bb (limited to 'packages') diff --git a/packages/python/python-pyqt4_0.9.2.bb b/packages/python/python-pyqt4_0.9.2.bb new file mode 100644 index 0000000000..099dc103ef --- /dev/null +++ b/packages/python/python-pyqt4_0.9.2.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "Python Qt4 Bindings" +HOMEPAGE = "http://riverbankcomputing.co.uk" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +LICENSE = "GPL" +DEPENDS = "qt4x11" +RDEPENDS = "python-core" +SRCNAME = "pyqt" +PR = "ml2" + +SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://optional-features.patch;patch=1" +S = "${WORKDIR}/PyQt4-gpl-4.0beta1" + +inherit qmake qt4x11 sip4 distutils-base + +PARALLEL_MAKE = "" + +QMAKE_PROFILES = "pyqt.pro" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xSessionManager -xAccessibility" +EXTRA_OEMAKE = " MAKEFLAGS= " + +SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" +# SIP_MODULES += "QtAssistant" +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ + INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}" + +#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ +# QMAKE_MOC=${STAGING_BINDIR}/moc \ +# QMAKE_RPATH=-Wl,-rpath-link, \ +# DESTDIR= \ +# VERSION=1.0.0 \ +# DEFINES+=SIP_MAKE_DLL \ +# DEFINES+=SIP_QT_SUPPORT \ +# INCLUDEPATH+=. \ +# INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ +# INCLUDEPATH+=${STAGING_INCDIR} \ +# LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro +} + +#do_configure() { +# echo "yes" | python configure.py -w -q ${OE_QMAKE_QMAKE} +#} + +do_stage() { + install -d ${STAGING_SIPDIR}/qt/ + install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages + for module in ${SIP_MODULES} + do + install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ + install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so + done +} + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 + for module in ${SIP_MODULES} + do + echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py + install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so + done + cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ + cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ +} + +FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" diff --git a/packages/python/python-pyqt4_0.9.bb b/packages/python/python-pyqt4_0.9.bb deleted file mode 100644 index 4a52e46f18..0000000000 --- a/packages/python/python-pyqt4_0.9.bb +++ /dev/null @@ -1,72 +0,0 @@ -DESCRIPTION = "Python Qt4 Bindings" -HOMEPAGE = "http://riverbankcomputing.co.uk" -AUTHOR = "Phil Thomson @ riverbank.co.uk" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -DEPENDS = "qt4x11" -RDEPENDS = "python-core" -SRCNAME = "pyqt" -PR = "ml1" - -SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt4-gpl-4.0beta1.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://optional-features.patch;patch=1" -S = "${WORKDIR}/PyQt4-gpl-4.0beta1" - -inherit qmake qt4x11 sip4 distutils-base - -PARALLEL_MAKE = "" - -QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1 -xVendorID -xSessionManager -xAccessibility" -EXTRA_OEMAKE = " MAKEFLAGS= " - -SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" -# SIP_MODULES += "QtAssistant" -EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${OE_QMAKE_INCDIR_QT}/Qt \ - INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR}" - -#EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic \ -# QMAKE_MOC=${STAGING_BINDIR}/moc \ -# QMAKE_RPATH=-Wl,-rpath-link, \ -# DESTDIR= \ -# VERSION=1.0.0 \ -# DEFINES+=SIP_MAKE_DLL \ -# DEFINES+=SIP_QT_SUPPORT \ -# INCLUDEPATH+=. \ -# INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ -# INCLUDEPATH+=${STAGING_INCDIR} \ -# LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" - -do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro -} - -#do_configure() { -# echo "yes" | python configure.py -w -q ${OE_QMAKE_QMAKE} -#} - -do_stage() { - install -d ${STAGING_SIPDIR}/qt/ - install -d ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages - for module in ${SIP_MODULES} - do - install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/ - install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so - done -} - -do_install() { - install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4 - for module in ${SIP_MODULES} - do - echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py - install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so - done - cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ - cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/ -} - -FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages" -- cgit v1.2.3 From 11616e3588c8df8985418a759612fadb30cc0c3c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 14:24:56 +0000 Subject: python 2.4.3: add some hints to site.py about what built this version and who is maintaining it --- packages/python/python-2.4.3/sitebranding.patch | 19 +++++++++++++++++++ packages/python/python_2.4.3.bb | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/python/python-2.4.3/sitebranding.patch (limited to 'packages') diff --git a/packages/python/python-2.4.3/sitebranding.patch b/packages/python/python-2.4.3/sitebranding.patch new file mode 100644 index 0000000000..85bb83a506 --- /dev/null +++ b/packages/python/python-2.4.3/sitebranding.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- Python-2.4.3/Lib/site.py~sitebranding ++++ Python-2.4.3/Lib/site.py +@@ -305,8 +305,9 @@ + "Jython is maintained by the Jython developers (www.jython.org).") + else: + __builtin__.credits = _Printer("credits", """\ +- Thanks to CWI, CNRI, BeOpen.com, Zope Corporation and a cast of thousands +- for supporting Python development. See www.python.org for more information.""") ++ This version of Python has been built by the OpenEmbedded buildsystem (http://openembedded.org). ++ It is a part of the Python-For-Embedded-Systems initiative which is maintained by ++ Michael 'Mickey' Lauer (http://www.Vanille.de/projects/python.spy).""") + here = os.path.dirname(os.__file__) + __builtin__.license = _Printer( + "license", "See http://www.python.org/%.3s/license.html" % sys.version, diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 289de18a53..30ce73abe2 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -6,14 +6,15 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "python-native readline zlib gdbm openssl tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.4" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://bindir-libdir.patch;patch=1 \ file://crosscompile.patch;patch=1 \ - file://fix-tkinter-detection.patch;patch=1" + file://fix-tkinter-detection.patch;patch=1 \ + file://sitebranding.patch;patch=1" S = "${WORKDIR}/Python-${PV}" inherit autotools -- cgit v1.2.3 From 261577deb860dbddd904acba4827129dfe6eb782 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 16:53:49 +0000 Subject: add qt4-x11 4.1.2 --- packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty | 0 .../configurable-cpu-extensions.patch | 34 +++++ packages/qt/qt4-x11-free-4.1.2/cross-compile.patch | 159 +++++++++++++++++++++ packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch | 102 +++++++++++++ .../fix-resinit-declaration.patch | 16 +++ packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch | 50 +++++++ packages/qt/qt4-x11-free-4.1.2/no-qmake.patch | 16 +++ packages/qt/qt4-x11-free-4.1.2/no-tools.patch | 16 +++ packages/qt/qt4-x11-free_4.1.2.bb | 138 ++++++++++++++++++ 9 files changed, 531 insertions(+) create mode 100644 packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty create mode 100644 packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/cross-compile.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/no-qmake.patch create mode 100644 packages/qt/qt4-x11-free-4.1.2/no-tools.patch create mode 100644 packages/qt/qt4-x11-free_4.1.2.bb (limited to 'packages') diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch new file mode 100644 index 0000000000..ab943db1ff --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch @@ -0,0 +1,34 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~configurable-cpu-extensions ++++ qt-x11-opensource-src-4.1.1/configure +@@ -564,6 +564,12 @@ + VAL=$1 + fi + ;; ++ -nosse) ++ CFG_SSE="no" ++ ;; ++ -sse) ++ CFG_SSE="yes" ++ ;; + -iwmmxt) + CFG_IWMMXT="yes" + ;; +@@ -1759,13 +1765,6 @@ + fi + fi + +-# detect sse support +-if $unixtests/sse.test $XQMAKESPEC $OPT_VERBOSE; then +- CFG_HAVE_SSE=no +-else +- CFG_HAVE_SSE=yes +-fi +- + # check iwmmxt support + if [ "$CFG_IWMMXT" = "yes" ]; then + if ! $unixtests/iwmmxt.test $XQMAKESPEC $OPT_VERBOSE; then diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch new file mode 100644 index 0000000000..7c8665c9c1 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch @@ -0,0 +1,159 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~cross-compile ++++ qt-x11-opensource-src-4.1.1/configure +@@ -534,7 +534,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL=$1 +@@ -845,6 +845,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -1698,131 +1701,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- x86_64) +- ARCH=x86_64 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:*) +- case "$UNAME_MACHINE" in +- sun4u) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- i86pc) +- case "$PLATFORM" in +- *-64) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- ;; +- *) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- esac +- esac +- ;; +- Darwin:*:*) +- case "$UNAME_MACHINE" in +- Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ;; +- x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ;; +- esac +- ARCH=macosx +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64|*:*:amd64) +- if [ "$PLATFORM" = "linux-g++-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:s390*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " IBM S/390 (s390)" +- fi +- ARCH=s390 +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch new file mode 100644 index 0000000000..e927df9c7d --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch @@ -0,0 +1,102 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf~fix-qmakespec ++++ qt-x11-opensource-src-4.1.1/mkspecs/linux-g++/qmake.conf +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(OE_QMAKE_CC) + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -16,19 +16,19 @@ + QMAKE_YACCFLAGS_MANGLE = -p $base -b $base + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) + QMAKE_CFLAGS_DEPS = -M + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = -w +-QMAKE_CFLAGS_RELEASE = -O2 ++QMAKE_CFLAGS_RELEASE = -O2 + QMAKE_CFLAGS_DEBUG = -g + QMAKE_CFLAGS_SHLIB = -fPIC + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +@@ -41,37 +41,37 @@ + + QMAKE_INCDIR = + QMAKE_LIBDIR = +-QMAKE_INCDIR_X11 = /usr/X11R6/include +-QMAKE_LIBDIR_X11 = /usr/X11R6/lib +-QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +-QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] +-QMAKE_INCDIR_OPENGL = /usr/X11R6/include +-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) ++QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS = ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +-QMAKE_LIBS_X11 = -lXext -lX11 -lm +-QMAKE_LIBS_X11SM = -lSM -lICE ++QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) ++QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) + QMAKE_LIBS_NIS = -lnsl + QMAKE_LIBS_OPENGL = -lGLU -lGL + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $(OE_QMAKE_MOC) ++QMAKE_UIC = $(OE_QMAKE_UIC) + +-QMAKE_AR = ar cqs ++QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_RANLIB = + + QMAKE_TAR = tar -cf +@@ -83,7 +83,7 @@ + QMAKE_MOVE = mv -f + QMAKE_DEL_FILE = rm -f + QMAKE_DEL_DIR = rmdir +-QMAKE_STRIP = strip ++QMAKE_STRIP = $(OE_QMAKE_STRIP) + QMAKE_STRIPFLAGS_LIB += --strip-unneeded + QMAKE_CHK_DIR_EXISTS = test -d + QMAKE_MKDIR = mkdir -p diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch new file mode 100644 index 0000000000..fcd5de6f97 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.1.1/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include + # include + # include +-extern "C" int res_init(); ++extern "C" int res_init() throw(); + #endif + + // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch new file mode 100644 index 0000000000..392aaf4f5f --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch @@ -0,0 +1,50 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/tools/qchar.h +@@ -219,7 +219,7 @@ + inline const char toLatin1() const; + inline const ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- inline ushort &unicode() { return *(&ucs); } ++ inline ushort &unicode() { return *((ushort*)&ucs); } + #else + inline ushort &unicode() { return ucs; } + #endif +--- qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/gui/kernel/qapplication_x11.cpp +@@ -1193,6 +1193,18 @@ + } + } + ++static void getXDefault(const char *group, const char *key, float *val) ++{ ++ char *str = XGetDefault(X11->display, group, key); ++ if (str) { ++ char *end = 0; ++ float v = strtod(str, &end); ++ if (str != end) ++ *val = v; ++ } ++} ++ ++ + static void getXDefault(const char *group, const char *key, bool *val) + { + char *str = XGetDefault(X11->display, group, key); +--- qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h~gcc4_1.patch ++++ qt-x11-opensource-src-4.1.1/src/corelib/global/qglobal.h +@@ -720,8 +720,8 @@ + + #if defined(QT_COORD_TYPE) + typedef QT_COORD_TYPE qreal; +-#elif defined(__arm__) +-typedef float qreal; ++//#elif defined(__arm__) ++//typedef float qreal; + #else + typedef double qreal; + #endif diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch new file mode 100644 index 0000000000..324f44303a --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/configure~no-qmake ++++ qt-x11-opensource-src-4.1.1/configure +@@ -2548,7 +2548,7 @@ + fi + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt/qt4-x11-free-4.1.2/no-tools.patch new file mode 100644 index 0000000000..2bda49c9c5 --- /dev/null +++ b/packages/qt/qt4-x11-free-4.1.2/no-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.1.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.1.1/src/src.pro +@@ -3,7 +3,7 @@ + + # this order is important + win32:SUBDIRS += winmain +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network svg ++SUBDIRS += corelib xml gui sql network svg + !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, qt3support): SUBDIRS += qt3support + !cross_compile { diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt/qt4-x11-free_4.1.2.bb new file mode 100644 index 0000000000..f769047d71 --- /dev/null +++ b/packages/qt/qt4-x11-free_4.1.2.bb @@ -0,0 +1,138 @@ +DESCRIPTION = "Qt/X11 Version ${PV}" +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +MAINTAINER = "Michael 'Mickey' Lauer " +DEPENDS = "uicmoc4-native qmake2-native freetype jpeg libx11 xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://fix-resinit-declaration.patch;patch=1 \ + file://no-tools.patch;patch=1 \ + file://no-qmake.patch;patch=1 \ + file://gcc4_1.patch;patch=1 \ + file://configurable-cpu-extensions.patch;patch=1 \ + file://fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +PARALLEL_MAKE = "" + +inherit qmake-base qt4x11 pkgconfig + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +export ARCH = "${TARGET_ARCH}" +export ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +# FIXME: +# * add missing options +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ + -nosse \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -verbose -stl -no-accessibility" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + #export QMAKESPEC="linux-oe-g++" + ln -sf ${STAGING_BINDIR}/qmake2 bin/qmake + #rm -rf ./mkspecs + #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs + echo yes | ./configure -prefix / -platform ${TARGET_OS}-g++ -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Svg Test Xml" + +do_stage() { + oe_runmake install INSTALL_ROOT=/ + install -m 0755 ${STAGING_BINDIR}/rcc4 ${STAGING_QT_DIR}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${STAGING_QT_DIR}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${STAGING_QT_DIR}/bin/uic + +} + +# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... +# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -pPR include/* ${D}${incdir} + cp -pPR plugins ${D}${libdir} + cp -pPR bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done + install -d ${D}${bindir}/qt4-demos + for binary in `find demos -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-demos/ + done +} + +PACKAGES =+ "libqtcore4 libqtgui4 libqtnetwork4 libqtsql4 libqtsvg4 libqttest4 libqtxml4 \ + libqtdesigner4 libqtdesignercomponents4 libqt3support4 \ + qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" + +ALLOW_EMPTY = "1" +FILES_${PN} = "" +RDEPENDS_${PN} = "${PACKAGES}" + +FILES_libqtcore4 = "${libdir}/libQtCore.so*" +FILES_libqtgui4 = "${libdir}/libQtGui.so*" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" +FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtsvg4 = "${libdir}/libQtSvg.so*" +FILES_libqttest4 = "${libdir}/libQtTest.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" +FILES_libqt3support4 = "${libdir}/libQt3Support.so*" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" + +FILES_qt4-common = "${bindir}/qtconfig" +FILES_qt4-examples = "${bindir}/qt4-examples/*" +FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" + +FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ + ${bindir}/qt3to4 ${bindir}/findtr" -- cgit v1.2.3 From 409db44ecd14ff2028ba9c68ab9e83efa72410ad Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 17:42:24 +0000 Subject: imkit: update to 0.4.5, still no compily --- packages/nonworking/imkit/imkit_0.4.0-pre2.bb | 20 -------------------- packages/nonworking/imkit/imkit_0.4.5.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 packages/nonworking/imkit/imkit_0.4.0-pre2.bb create mode 100644 packages/nonworking/imkit/imkit_0.4.5.bb (limited to 'packages') diff --git a/packages/nonworking/imkit/imkit_0.4.0-pre2.bb b/packages/nonworking/imkit/imkit_0.4.0-pre2.bb deleted file mode 100644 index 2e809b11c1..0000000000 --- a/packages/nonworking/imkit/imkit_0.4.0-pre2.bb +++ /dev/null @@ -1,20 +0,0 @@ -# -# nonworking, because the c++ template syntax no longer compiles with modern compilers -# -DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine" -HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en" -SECTION = "opie/inputmethods" -LICENSE = "GPL" -RDEPENDS = "anthy" - -SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/2195/imkit-${PV}.tar.gz" -S = "${WORKDIR}/imkit-${PV}" - -inherit palmtop - -PARALLEL_MAKE = "" -QMAKE_PROFILES = "imkit.pro" - -do_configure_prepend() { - echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro -} diff --git a/packages/nonworking/imkit/imkit_0.4.5.bb b/packages/nonworking/imkit/imkit_0.4.5.bb new file mode 100644 index 0000000000..a07e2c4849 --- /dev/null +++ b/packages/nonworking/imkit/imkit_0.4.5.bb @@ -0,0 +1,20 @@ +# +# nonworking, because the c++ template syntax no longer compiles with modern compilers +# +DESCRIPTION = "An Inputmethod for Opie - frontend to the japanese anthy engine" +HOMEPAGE = "http://zaurus-ja.sourceforge.jp/imkit-anthy.html.en" +SECTION = "opie/inputmethods" +LICENSE = "GPL" +RDEPENDS = "anthy" + +SRC_URI = "http://downloads.sourceforge.jp/zaurus-ja/9316/imkit-0.4.5.tar.gz" +S = "${WORKDIR}/imkit-${PV}" + +inherit palmtop + +PARALLEL_MAKE = "" +QMAKE_PROFILES = "imkit.pro" + +do_configure_prepend() { + echo -e "TEMPLATE=subdirs\nSUBDIRS=libimkit impls/anthy\n" > imkit.pro +} -- cgit v1.2.3 From afe088dc3559e2ea5ffed51ed5edd1d4b2948e5d Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Wed, 3 May 2006 17:50:16 +0000 Subject: initscripts: Add forgotten volatiles cset --- packages/initscripts/initscripts-1.0/volatiles | 31 +++++++++++++------------- packages/initscripts/initscripts_1.0.bb | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles index 37ce8b529a..2bc7d82fbd 100644 --- a/packages/initscripts/initscripts-1.0/volatiles +++ b/packages/initscripts/initscripts-1.0/volatiles @@ -21,19 +21,18 @@ # This explains the order of "link before object" as in the example above, where # a link will be created at /var/test pointing to /tmp/testfile and due to this # link the file defined as /var/test will actually be created as /tmp/testfile. -d root root 0775 /var -d root root 0755 /var/backups -d root root 0755 /var/cache -d root root 0755 /var/lib -d root root 0755 /var/lib/ipkg -d root root 0755 /var/lib/misc -d root root 2775 /var/local -d root root 1777 /var/lock -d root root 0755 /var/lock/subsys -d root root 0755 /var/log -d root root 0755 /var/run -d root root 0755 /var/spool -d root root 1777 /var/tmp -f root root 0664 /var/run/utmp -f root root 0664 /var/log/wtmp -f root root 0664 /var/log/lastlog +d root root 0775 /var none +d root root 0755 /var/backups none +d root root 0755 /var/cache none +d root root 0755 /var/lib none +d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/misc none +d root root 2775 /var/local none +d root root 1777 /var/lock none +d root root 0755 /var/lock/subsys none +d root root 0755 /var/log none +d root root 0755 /var/run none +d root root 0755 /var/spool none +d root root 1777 /var/tmp none +f root root 0664 /var/run/utmp none +f root root 0664 /var/log/wtmp none diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index b3c0bfb9ab..eebfbca7bf 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r72" +PR = "r73" SRC_URI = "file://halt \ file://ramdisk \ -- cgit v1.2.3 From f62d2de0dd6507969fc8d08c2308392b1f275914 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 May 2006 18:20:34 +0000 Subject: telepathy-gabble: add 20060503 snapshot --- packages/telepathy/.mtn2git_empty | 0 packages/telepathy/telepathy-gabble_20060503.bb | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 packages/telepathy/.mtn2git_empty create mode 100644 packages/telepathy/telepathy-gabble_20060503.bb (limited to 'packages') diff --git a/packages/telepathy/.mtn2git_empty b/packages/telepathy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/telepathy/telepathy-gabble_20060503.bb b/packages/telepathy/telepathy-gabble_20060503.bb new file mode 100644 index 0000000000..c873894f1c --- /dev/null +++ b/packages/telepathy/telepathy-gabble_20060503.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gabble: a Jabber/XMPP connection manager" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus loudmouth" +LICENSE = "lgpl" +MAINTAINER = "Koen Kooi " + +SRC_URI = "http://ewi546.ewi.utwente.nl/OE/source/telepathy-gabble-${PV}.tar.bz2" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}/" + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" -- cgit v1.2.3 From 62939b1a74e7b13e9dd76408ef64da2d1dd1a376 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 May 2006 21:42:19 +0000 Subject: add gsoap, generates C/C++ source codes for Web service and client applications --- packages/gsoap/.mtn2git_empty | 0 packages/gsoap/gsoap-native_2.7.7.bb | 11 +++++++++++ packages/gsoap/gsoap_2.7.7.bb | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 packages/gsoap/.mtn2git_empty create mode 100644 packages/gsoap/gsoap-native_2.7.7.bb create mode 100644 packages/gsoap/gsoap_2.7.7.bb (limited to 'packages') diff --git a/packages/gsoap/.mtn2git_empty b/packages/gsoap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsoap/gsoap-native_2.7.7.bb b/packages/gsoap/gsoap-native_2.7.7.bb new file mode 100644 index 0000000000..3ee6daf247 --- /dev/null +++ b/packages/gsoap/gsoap-native_2.7.7.bb @@ -0,0 +1,11 @@ +require gsoap_${PV}.bb +inherit native + +do_stage() { + autotools_stage_all +} + +do_install() { + : +} + diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb new file mode 100644 index 0000000000..fb782ecb0b --- /dev/null +++ b/packages/gsoap/gsoap_2.7.7.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \ +for the development of SOAP Web Services and clients." +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "gsoap-native" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz" +S = "${WORKDIR}/gsoap-2.7" + +inherit autotools + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR}/soapcpp2" + +do_install_append() { + install -d ${D}${libdir} + for lib in libgsoapssl libgsoapssl++ libgsoap libgsoapck++ libgsoap++ libgsoapck + do + oe_libinstall -C soapcpp2 $lib ${D}${libdir} + done +} + +PACKAGES = "gsoap-dev" +FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}" -- cgit v1.2.3 From d3cbbe059a411b8639b398e2a7839da6372fcc54 Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Wed, 3 May 2006 21:47:07 +0000 Subject: packages/linux/linux-openzaurus_2.6.16: tosa update (lot of fixes) --- packages/linux/linux-openzaurus-2.6.16/defconfig-tosa | 2 +- packages/linux/linux-openzaurus_2.6.16.bb | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa index 36dd3c7888..ed4cfd8cb3 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa @@ -1335,7 +1335,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_PCF8563 is not set # CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_SA1100 is not set +CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set # diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index ad293b82b3..e37753ee16 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r19" +PR = "r20" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -117,14 +117,19 @@ SRC_URI_append_tosa = "\ ${CHSRC}/tmio-nand-r5.patch;patch=1 \ ${CHSRC}/tmio-ohci-r3.patch;patch=1 \ ${CHSRC}/tmio-fb-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r13.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r14.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \ - ${RPSRC}/temp/tosa-tmio-r4-rp1.patch;patch=1 \ - ${DOSRC}/tosa-power-r14.patch;patch=1 \ - ${RPSRC}/tosa-tmio-lcd-r5-rp1.patch;patch=1 \ - ${DOSRC}/tosa-bluetooth-r5.patch;patch=1 \ + ${DOSRC}/tosa-tmio-r6.patch;patch=1 \ + ${DOSRC}/tosa-power-r15.patch;patch=1 \ + ${DOSRC}/tosa-tmio-lcd-r7.patch;patch=1 \ + ${DOSRC}/tosa-bluetooth-r6.patch;patch=1 \ ${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \ - ${DOSRC}/tosa-asoc-r0.patch;patch=1 " + ${DOSRC}/wm9712-suspend-cold-res-r0.patch;patch=1 \ + ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ + ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ + ${DOSRC}/wm9712-reset-loop-r0.patch;patch=1 \ + ${DOSRC}/tosa-asoc-r1.patch;patch=1 " SRC_URI_append_poodle = "\ ${RPSRC}/rp_poodle_hacks-r0.patch;patch=1" -- cgit v1.2.3 From 1b506a31ec25abe651d5b431b8a10956bc569517 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 May 2006 23:34:28 +0000 Subject: xorg SRC_URIs: some updates after upstream renamed things (add X11R7 into filenames/checkout diectories). There will be other packages suffering this problem. Also add missing kbproto DEPENDS to libxt. --- packages/xlibs/libxt_1.0.0.bb | 6 +++--- packages/xlibs/util-macros_1.0.1.bb | 4 +++- packages/xproto/proto-common.inc | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/xlibs/libxt_1.0.0.bb b/packages/xlibs/libxt_1.0.0.bb index 0f9fbf1860..be1b4c94e9 100644 --- a/packages/xlibs/libxt_1.0.0.bb +++ b/packages/xlibs/libxt_1.0.0.bb @@ -4,11 +4,11 @@ PRIORITY = "optional" #MAINTAINER = "" LICENSE = "X-MIT" -DEPENDS = "libx11 libsm util-macros" +DEPENDS = "libx11 libsm util-macros kbproto" PROVIDES = "xt" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-${PV}.tar.bz2" -S = "${WORKDIR}/libXt-${PV}" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXt-X11R7.0-${PV}.tar.bz2" +S = "${WORKDIR}/libXt-X11R7.0-${PV}" inherit autotools pkgconfig diff --git a/packages/xlibs/util-macros_1.0.1.bb b/packages/xlibs/util-macros_1.0.1.bb index 87e2ecfa62..c019e94780 100644 --- a/packages/xlibs/util-macros_1.0.1.bb +++ b/packages/xlibs/util-macros_1.0.1.bb @@ -3,7 +3,9 @@ SECTION = "x11/libs" LICENSE= "Xorg" #MAINTAINER = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/util/${PN}-X11R7.0-${PV}.tar.bz2" + +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" inherit autotools pkgconfig diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc index 4a712a810a..f35a791171 100644 --- a/packages/xproto/proto-common.inc +++ b/packages/xproto/proto-common.inc @@ -3,7 +3,9 @@ SECTION = "x11/libs" LICENSE= "MIT-X" #MAINTAINER = "" -SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2" + +S = "${WORKDIR}/${PN}-X11R7.0-${PV}" inherit autotools pkgconfig -- cgit v1.2.3 From 079dcb139403431fb19b752df884fc14aa506abe Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 4 May 2006 08:23:27 +0000 Subject: xcb-proto: add 0.9 release --- packages/xproto/xcb-proto_0.9.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 packages/xproto/xcb-proto_0.9.bb (limited to 'packages') diff --git a/packages/xproto/xcb-proto_0.9.bb b/packages/xproto/xcb-proto_0.9.bb new file mode 100644 index 0000000000..ba5e3ed953 --- /dev/null +++ b/packages/xproto/xcb-proto_0.9.bb @@ -0,0 +1,6 @@ +include proto-common.inc + +SRC_URI = "http://xcb.freedesktop.org/dist/${P}.tar.bz2" + + + -- cgit v1.2.3