From 641e3b0c3b0ec4e337742d0297142b712ac1b725 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 13:13:36 +0000 Subject: sharprom-compatible.conf: upgrade and add the new meta-fields @MENTOR and @REQUIREMENTS --- conf/distro/sharprom-compatible.conf | 40 ++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 11bb62a5d1..c059775576 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -1,38 +1,32 @@ #@TYPE: Distribution #@NAME: SharpROM -#@DESCRIPTION: Distribution configuration for SharpROM compatible packages - -# -# This is pretty ad-hoc - feel free to improve as needed :) -# +#@DESCRIPTION: Distribution configuration for SharpROM (Zaurus) compatible packages +#@MENTOR: Michael 'Mickey' Lauer +#@REQUIREMENTS: A prebuilt SharpROM Embedix Toolchain in your PATH. +#@REQUIREMENTS: Rename arm-linux-gcc|g++ to arm-linux-gcc-2.95 and rename arm-linux-ld to arm-linux-ld-2.11.2. INHERIT += " package_ipk debian sharprom" +# +# Zaurus +# TARGET_OS = "linux" TARGET_FPU = "" TARGET_ARCH = "arm" TARGET_CC_ARCH = "-march=armv4" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O2" - -DISTRO = "sharprom" -DISTRO_NAME = "SharpROM" -DISTRO_VERSION = "3.1 compatible" -DISTRO_TYPE = "debug" -# DISTRO_TYPE = "release" - -# -# Zaurus -# - OEINCLUDELOGS = "yes" KERNEL_CONSOLE = "tty1" #DEBUG_OPTIMIZATION = "-O -g3" #DEBUG_BUILD = "1" -#INHIBIT_PACKAGE_STRIP = "1" # # Base # +DISTRO = "sharprom" +DISTRO_NAME = "SharpROM" +DISTRO_VERSION = "3.1 compatible" +DISTRO_TYPE = "debug" ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95 binutils-cross gcc-cross-initial gcc-cross" ASSUME_PROVIDED += "virtual/arm-linux-libc-for-gcc virtual/arm-linux-binutils virtual/arm-linux-gcc" @@ -42,23 +36,25 @@ ASSUME_PROVIDED += "virtual/libc linux-libc-headers" DEPENDS =+ "sharprom-toolchain-native" IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" +#INHIBIT_PACKAGE_STRIP = "1" # # Opie # - PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" - -OPIE_VERSION = "1.2.0" +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" +PALMTOP_USE_MULTITHREADED_QT = "no" include conf/distro/preferred-opie-versions.inc # # GPE # - SRCDATE_xserver-kdrive = "20050208" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" - include conf/distro/preferred-gpe-versions.inc +# +# E +# -- cgit v1.2.3 From cff527eed5ac762b811f504753c21a797a12d475 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 14:22:39 +0000 Subject: python-pyqt: fix virtual/libqpe1 dependency --- packages/python/python-pyqt_3.13.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index bddc1dca95..76562a8f07 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Python Qt/Embedded + Qt/Palmtop Bindings" HOMEPAGE = "http://www.vanille.de/projects/python.spy" +AUTHOR = "Phil Thomson @ riverbank.co.uk" SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" RDEPENDS = "python-core python-sip" -DEPENDS = "virtual/libqte2 virtual/libqpe" +DEPENDS = "virtual/libqte2 virtual/libqpe1" SRCNAME = "pyqt" PR = "ml3" @@ -22,7 +23,7 @@ SIP_MODULES = "qt qtcanvas qttable qtpe" SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " -EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \ +EXTRA_QMAKEVARS_POST += " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \ CONFIG=qt CONFIG+=warn_on CONFIG+=release \ DESTDIR= VERSION=1.0.0 \ DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \ -- cgit v1.2.3 From 20233c3d1763462a908c7331713f055e53a2a4fd Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 15:04:04 +0000 Subject: palmtop.bbclass: add a special case for sharprom compatible distros -- gcc 2.95 has no idea about libsupc++ --- classes/palmtop.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index 7c65271b91..9d54de8748 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -9,7 +9,10 @@ inherit qmake -EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++" +# special case for DISTRO = sharprom +CPP_SUPPORT_LIB = "LIBS-=-lstdc++ LIBS+=-lsupc++" +CPP_SUPPORT_LIB_sharprom = "LIBS-=-lstdc++" +EXTRA_QMAKEVARS_POST += "DEFINES+=QWS CONFIG+=qt ${CPP_SUPPORT_LIB}" EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "CONFIG-=thread",d)}' EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" -- cgit v1.2.3 From 7f9c35f8e1902227eb9c393322ff5be95302687c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 15:19:38 +0000 Subject: task-python-sharprom: update and switch to date based versioning --- packages/meta/task-python-sharprom_1.0.0.bb | 68 -------------------------- packages/meta/task-python-sharprom_20060425.bb | 68 ++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 68 deletions(-) delete mode 100644 packages/meta/task-python-sharprom_1.0.0.bb create mode 100644 packages/meta/task-python-sharprom_20060425.bb diff --git a/packages/meta/task-python-sharprom_1.0.0.bb b/packages/meta/task-python-sharprom_1.0.0.bb deleted file mode 100644 index a90e31b76a..0000000000 --- a/packages/meta/task-python-sharprom_1.0.0.bb +++ /dev/null @@ -1,68 +0,0 @@ -DESCRIPTION= "Everything Python for SharpROM" -MAINTAINER = "Michael 'Mickey' Lauer " -HOMEPAGE = "http://www.vanille.de/projects/python.spy" -LICENSE = "MIT" -PR = "ml3" - -NONWORKING = "\ - python-codes \ - python-crypto \ - python-gmpy \ - python-pysqlite \ - python-pygtk \ - python-pyqwt \ - python-sgmlop \ - python-vorbis" - -RDEPENDS = "\ - python-ao \ - python-pybluez \ - python-constraint \ - python-dialog \ - python-egenix-mx-base \ - python-pycurl \ - python-fnorb \ - python-fpconst \ - python-gnosis \ - python-hmm \ - python-irclib \ - python-itools \ - python-libgmail \ - python-logilab \ - python-mad \ - python-native \ - python-numeric \ - python-ogg \ - python-pexpect \ - python-pychecker \ - python-pyflakes \ - python-pygoogle \ - python-pylinda \ - python-pylint \ - python-pyqt \ - python-pyreverse \ - python-pyro \ - python-pyserial \ - python-pyvisa \ - python-pyweather \ - python-pyxml \ - python-pyxmlrpc \ - python-quicklauncher \ - python-scapy \ - python-scons \ - python-sip \ - python-snmplib \ - python-soappy \ - python-sword \ - python-tlslite \ - python-urwid \ - python-vmaps \ - moin \ - plone \ - twisted \ - zope" - -#fixme add python-pycap once libdnet is in again -#fixme add python-pyx once kpathwhich-native is there -#fixme add packages dynamically -#fixme python-numarray doesn't work with soft-float diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/meta/task-python-sharprom_20060425.bb new file mode 100644 index 0000000000..dded5af9f9 --- /dev/null +++ b/packages/meta/task-python-sharprom_20060425.bb @@ -0,0 +1,68 @@ +DESCRIPTION = "Everything Python for SharpROM" +MAINTAINER = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.vanille.de/projects/python.spy" +LICENSE = "MIT" +PR = "ml0" + +NONWORKING = "\ + python-codes \ + python-crypto \ + python-gmpy \ + python-pybluez \ + python-pysqlite \ + python-pygtk \ + python-pyqwt \ + python-sgmlop \ + python-sword \ + python-vorbis" + +RDEPENDS = "\ + python-ao \ + python-constraint \ + python-dialog \ + python-egenix-mx-base \ + python-pycurl \ + python-fnorb \ + python-fpconst \ + python-gnosis \ + python-hmm \ + python-irclib \ + python-itools \ + python-libgmail \ + python-logilab \ + python-mad \ + python-native \ + python-numeric \ + python-ogg \ + python-pexpect \ + python-pychecker \ + python-pyflakes \ + python-pygoogle \ + python-pylinda \ + python-pylint \ + python-pyqt \ + python-pyreverse \ + python-pyro \ + python-pyserial \ + python-pyvisa \ + python-pyweather \ + python-pyxml \ + python-pyxmlrpc \ + python-quicklauncher \ + python-scapy \ + python-scons \ + python-sip \ + python-snmplib \ + python-soappy \ + python-tlslite \ + python-urwid \ + python-vmaps \ + moin \ + plone \ + twisted \ + zope" + +#fixme add python-pycap once libdnet is in again +#fixme add python-pyx once kpathwhich-native is there +#fixme add packages dynamically +#fixme python-numarray doesn't work with soft-float -- cgit v1.2.3 From 56b62dcfb3e0b64ea9528fd3e11107df45b4fe66 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 17:17:41 +0000 Subject: python-sip: inherit palmtop to make it qte/qte-mt logic working --- packages/python/python-sip_4.1.1.bb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb index 5a402d3aee..8fd2e08c7d 100644 --- a/packages/python/python-sip_4.1.1.bb +++ b/packages/python/python-sip_4.1.1.bb @@ -5,15 +5,14 @@ MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "virtual/libqte2 python" RDEPENDS = "python-core" -PR = "ml3" +PR = "ml4" SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz" S = "${WORKDIR}/sip-${PV}/siplib" -inherit qmake distutils-base +inherit palmtop distutils-base -EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ - CONFIG=qt \ +EXTRA_QMAKEVARS_POST += "TEMPLATE=lib \ DESTDIR= \ VERSION=1.0.0 \ TARGET=sip \ @@ -22,7 +21,6 @@ EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ INCLUDEPATH+=${STAGING_INCDIR}" - do_configure_prepend() { cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro } -- cgit v1.2.3 From ff1696f37fcd0e1fce5c0332bf9c92239189989d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 17:28:26 +0000 Subject: python-pyqt: inherit palmtop to use the qte/qte-mt logic and to remove duplicated stuff --- packages/python/python-pyqt_3.13.bb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb index 76562a8f07..72efea077c 100644 --- a/packages/python/python-pyqt_3.13.bb +++ b/packages/python/python-pyqt_3.13.bb @@ -5,17 +5,17 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -RDEPENDS = "python-core python-sip" DEPENDS = "virtual/libqte2 virtual/libqpe1" +RDEPENDS = "python-core python-sip" SRCNAME = "pyqt" -PR = "ml3" +PR = "ml4" SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://qt2-fix.patch;patch=1 \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake sip distutils-base +inherit palmtop sip distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" @@ -23,15 +23,17 @@ SIP_MODULES = "qt qtcanvas qttable qtpe" SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " -EXTRA_QMAKEVARS_POST += " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, \ - CONFIG=qt CONFIG+=warn_on CONFIG+=release \ - DESTDIR= VERSION=1.0.0 \ - DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \ - INCLUDEPATH=. \ +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 \ - LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" do_configure_prepend() { echo -e "TEMPLATE=subdirs\nSUBDIRS=qt qtcanvas qttable qtpe\n" >pyqt.pro -- cgit v1.2.3 From e03568f545e31601cdb5d57d94fedc1b074b4ae5 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 17:57:53 +0000 Subject: smpeg: fix staging, improve packaging --- packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb index 8d5bf1b283..8950810290 100644 --- a/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb +++ b/packages/smpeg/smpeg_0.4.4+0.4.5cvs20040311.bb @@ -1,12 +1,10 @@ +DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \ +player for Linux based on the mpeg_play and SPLAY MPEG decoders." LICENSE = "LGPL" -SECTION = "console/multimedia" -PRIORITY = "optional" +SECTION = "libs/multimedia" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "virtual/libsdl" PROVIDES = "smpeg" -DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \ -player for Linux based on the mpeg_play and SPLAY \ -MPEG decoders." SRC_URI = "cvs://anonymous:anonymous@cvs.icculus.org/cvs/cvsroot;module=smpeg;date=20040311 \ file://m4.patch;patch=1 \ @@ -27,7 +25,7 @@ do_configure_prepend () { } do_stage() { - oe_libinstall libsmpeg-0.4 ${STAGING_LIBDIR} + oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR} ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so for f in "*.h" @@ -42,3 +40,9 @@ do_stage() { chmod a+rx ${STAGING_BINDIR}/smpeg-config } +PACKAGES =+ "plaympeg " +SECTION_plaympeg = "console/multimedia" +FILES_${PN} = "${libdir}" +FILES_plaympeg = "${bindir}/plaympeg" +FILES_${PN}-dev += "${bindir}" + -- cgit v1.2.3 From 1b596f262b764ac915ed8e4a0f0b06e9e321c091 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 18:14:39 +0000 Subject: python-pyqwt: make it build again, make it work w/ qte/qte-mt --- packages/python/python-pyqwt_3.10.bb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb index 8677ed05ea..8e47c04544 100644 --- a/packages/python/python-pyqwt_3.10.bb +++ b/packages/python/python-pyqwt_3.10.bb @@ -7,14 +7,14 @@ LICENSE = "GPL" RDEPENDS = "python-core python-sip python-pyqt (>=${PV}) python-numeric qwt" DEPENDS = "virtual/libqte2 python-numeric python-pyqt qwt" SRCNAME = "pyqwt" -PR = "ml3" +PR = "ml4" SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://qt2.x-compat.patch;patch=1 \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit qmake sip distutils-base +inherit palmtop sip distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" @@ -22,14 +22,16 @@ SIP_MODULES = "qwt" SIP_FEATURES = "${WORKDIR}/features" EXTRA_OEMAKE = " MAKEFLAGS= " -EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \ - TARGET=qwt DESTDIR= VERSION=1.0.0 \ - DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \ +EXTRA_QMAKEVARS_POST += "TARGET=qwt \ + DESTDIR= \ + VERSION=1.0.0 \ + DEFINES+=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT \ + DEFINES+=HAS_NUMERIC DEFINES+=QWT_NO_MEMARRAY \ INCLUDEPATH+=../numpy \ + INCLUDEPATH+=${S}/qwt-sources/include \ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \ INCLUDEPATH+=${STAGING_INCDIR} \ - LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \ - LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe " + LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages" do_generate_prepend() { echo -e "TEMPLATE=subdirs\nSUBDIRS=qwt\n" >pyqwt.pro -- cgit v1.2.3 From 9e64560b051ec5867d0136c2509e0f1db79a6f7d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 18:18:18 +0000 Subject: qwt: make it work w/ qte/qte-mt --- packages/qwt/qwt_4.2.0rc1.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb index efae3446e9..f2cbe7d37f 100644 --- a/packages/qwt/qwt_4.2.0rc1.bb +++ b/packages/qwt/qwt_4.2.0rc1.bb @@ -4,14 +4,14 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" DEPENDS = "virtual/libqte2" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tgz \ file://qt2-fix.patch;patch=1" -inherit qmake +inherit palmtop -EXTRA_QMAKEVARS_POST = "CONFIG-=thread DEFINES+=QWS" +EXTRA_QMAKEVARS_POST += "LIBS-=qpe" do_stage() { oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR} @@ -25,3 +25,5 @@ do_install() { cp -pPR include/* ${D}${includedir} } +FILES_${PN} = "${libdir}" + -- cgit v1.2.3 From 30713d71eeba2d377298dd7ba09972bc3b96988c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 18:34:12 +0000 Subject: python 2.4.3: remove tcl and tk for the sharprom --- packages/python/python_2.4.3.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 600bee2df6..289de18a53 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,8 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml1" +DEPENDS_sharprom = "python-native readline zlib gdbm openssl" +PR = "ml2" PYTHON_MAJMIN = "2.4" @@ -63,5 +64,6 @@ do_install() { include python-${PV}-manifest.inc RPROVIDES_python-core = "python" +RPROVIDES_python-curses = "python" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" -- cgit v1.2.3 From 97d951baea0b7278634118ac3db1a2584820b5f3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 25 Apr 2006 18:35:14 +0000 Subject: python-pygtk2: upgrade to 2.8.6 and remove obsolete versions --- packages/python/python-pygtk2_2.4.1.bb | 23 ----------------------- packages/python/python-pygtk2_2.6.2.bb | 25 ------------------------- packages/python/python-pygtk2_2.8.6.bb | 24 ++++++++++++++++++++++++ packages/python/python-pygtk_2.2.0.bb | 19 ------------------- packages/python/python-sip4_4.4.1.bb | 2 +- 5 files changed, 25 insertions(+), 68 deletions(-) delete mode 100644 packages/python/python-pygtk2_2.4.1.bb delete mode 100644 packages/python/python-pygtk2_2.6.2.bb create mode 100644 packages/python/python-pygtk2_2.8.6.bb delete mode 100644 packages/python/python-pygtk_2.2.0.bb diff --git a/packages/python/python-pygtk2_2.4.1.bb b/packages/python/python-pygtk2_2.4.1.bb deleted file mode 100644 index 2b589e8d8a..0000000000 --- a/packages/python/python-pygtk2_2.4.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Python GTK+ Bindings" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "gtk+ libglade" -SRCNAME = "pygtk" -LICENSE = "LGPL" -PR = "r0" - -SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${SRCNAME}-${PV}.tar.bz2 \ - file://acinclude.m4" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit autotools pkgconfig distutils-base - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ -} - -do_stage() { - autotools_stage_includes -} - diff --git a/packages/python/python-pygtk2_2.6.2.bb b/packages/python/python-pygtk2_2.6.2.bb deleted file mode 100644 index c9102e6347..0000000000 --- a/packages/python/python-pygtk2_2.6.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Python GTK+ Bindings" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "gtk+ libglade" -RDEPENDS += "python-shell" -SRCNAME = "pygtk" -LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \ - file://acinclude.m4" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit autotools pkgconfig distutils-base - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ -} - -do_stage() { - autotools_stage_includes - install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ -} - diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb new file mode 100644 index 0000000000..d91e13532c --- /dev/null +++ b/packages/python/python-pygtk2_2.8.6.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Python GTK+ Bindings" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer " +DEPENDS = "gtk+ libglade" +RDEPENDS = "python-shell" +SRCNAME = "pygtk" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \ + file://acinclude.m4" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit autotools pkgconfig distutils-base + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_stage() { + autotools_stage_includes + install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/ +} diff --git a/packages/python/python-pygtk_2.2.0.bb b/packages/python/python-pygtk_2.2.0.bb deleted file mode 100644 index 16d8676282..0000000000 --- a/packages/python/python-pygtk_2.2.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Python GTK+ Bindings" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "gtk+ libglade" -RDEPENDS = "python-shell" -SRCNAME = "pygtk" -LICENSE = "LGPL" -PR = "r3" - -SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${SRCNAME}-${PV}.tar.bz2" -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit autotools pkgconfig distutils-base - -do_stage() { - autotools_stage_includes -} - diff --git a/packages/python/python-sip4_4.4.1.bb b/packages/python/python-sip4_4.4.1.bb index 97f7375056..4bdc8ed769 100644 --- a/packages/python/python-sip4_4.4.1.bb +++ b/packages/python/python-sip4_4.4.1.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/sip-${PV}/siplib" inherit qmake distutils-base -EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \ +EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \ CONFIG=console \ DESTDIR= \ VERSION=1.0.0 \ -- cgit v1.2.3