diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/konqueror/konqueror-embedded_20060404.bb (renamed from packages/konqueror/konqueror-embedded_svn.bb) | 33 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie.inc | 11 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie_1.2.1.bb | 1 | ||||
-rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 1 | ||||
-rw-r--r-- | packages/python/python_2.3.4.bb | 3 | ||||
-rw-r--r-- | packages/python/python_2.4.3.bb | 4 | ||||
-rw-r--r-- | packages/qte/qte-2.3.12/fix-errno-exception-spec.patch | 16 | ||||
-rw-r--r-- | packages/qte/qte-2.3.12/fix-native-build.patch | 11 | ||||
-rw-r--r-- | packages/qte/qte-2.3.12/gcc4.patch | 16 | ||||
-rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 2 | ||||
-rw-r--r-- | packages/qte/qte-common_2.3.12.inc (renamed from packages/qte/qte_2.3.12.bb) | 37 | ||||
-rw-r--r-- | packages/qte/qte-mt-static_2.3.12.bb | 23 | ||||
-rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 4 | ||||
-rw-r--r-- | packages/qte/qte-mt_2.3.12.bb | 9 | ||||
-rw-r--r-- | packages/qte/qte_2.3.10.bb | 1 | ||||
-rw-r--r-- | packages/sdlperl/sdl-perl_1.20.3.bb | 40 |
16 files changed, 148 insertions, 64 deletions
diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_20060404.bb index c561af3b28..1d269e611e 100644 --- a/packages/konqueror/konqueror-embedded_svn.bb +++ b/packages/konqueror/konqueror-embedded_20060404.bb @@ -2,21 +2,18 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition SECTION = "opie/applications" PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" -DEPENDS = "openssl pcre qte-mt-static dcopidl-native" +DEPENDS = "openssl pcre virtual/libqte2 dcopidl-native" LICENSE = "LGPL/GPL" -DEFAULT_PREFERENCE = "-1" -FILES_${PN} = "${palmtopdir} /usr/share" -PR = "r1" -PV = "3.5.1+svn${SRCDATE}" +PR = "r2" # this Konqueror needs the KDEDIR set and the font helvetica installed on the target inherit autotools -SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs \ - svn://anonsvn.kde.org/home/kde/trunk;module=kdenox \ - file://inject-extraflags.patch;patch=1" - +SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs;date=${PV} \ + svn://anonsvn.kde.org/home/kde/trunk;module=kdenox;date=${PV}" +# uncomment this for a static build +# file://inject-extraflags.patch;patch=1" S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR}/qmake" @@ -25,12 +22,13 @@ export UIC = "${STAGING_BINDIR}/uic" export exec_prefix = "${palmtopdir}" export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" -EXTRAFLAGS = "-lts" -EXTRAFLAGS_c7x0 = "-lts -laticore" +# uncomment this for a static build +# EXTRAFLAGS = "-lts" +# EXTRAFLAGS_c7x0 = "-lts -laticore" export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'" EXTRA_OECONF = '--prefix=${palmtopdir} \ - --exec-prefix=${palmtopdir} \ + --exec-prefix=${palmtopdir} \ --includedir=${STAGING_INCDIR} \ --with-extra-includes=${STAGING_INCDIR} \ --with-extra-libs=${STAGING_LIBDIR} \ @@ -40,11 +38,11 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ --enable-fontsubs \ --with-konq-tmp-prefix=/tmp/kde-cache \ - --enable-static \ -# --disable-static \ -# --enable-shared \ +# --enable-static \ + --disable-static \ + --enable-shared \ --disable-debug \ - --with-gui=road \ + --with-gui=road \ --with-ipv6-lookup=no \ --without-xinerama \ --disable-scrollbars \ @@ -77,3 +75,6 @@ do_configure_prepend() { do_compile_prepend() { perl admin/am_edit } + +FILES_${PN} = "${palmtopdir} ${datadir}" + diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 3e7c74e7ef..5f114c094b 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -1,21 +1,20 @@ -DESCRIPTION = "Base library for the Qt Palmtop Environment" +DESCRIPTION = "Base library for the Qt/Embedded based palmtop environments" SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -DEPENDS = "uicmoc-native qte" -PROVIDES = "virtual/libqpe" +DEPENDS = "uicmoc-native virtual/libqte2" +PROVIDES = "virtual/libqpe1" S = "${WORKDIR}/library" inherit qmake QMAKE_PROFILES = "library.pro" -EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK" +EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK CONFIG+=thread" EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -# EXTRA_QMAKEVARS_POST = "DESTDIR=" -CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions" +CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED " diff --git a/packages/libqpe/libqpe-opie_1.2.1.bb b/packages/libqpe/libqpe-opie_1.2.1.bb index 6cd4368187..fd806b8ca6 100644 --- a/packages/libqpe/libqpe-opie_1.2.1.bb +++ b/packages/libqpe/libqpe-opie_1.2.1.bb @@ -1,6 +1,7 @@ include ${PN}.inc TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ file://0905_datebookmonth.patch;patch=1;pnum=0 \ diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 8e0278daa1..9657868b0f 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -2,6 +2,7 @@ include ${PN}.inc # Remove the dash below when 1.2.1 changes PV = "1.2.1+cvs-${SRCDATE}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1" diff --git a/packages/python/python_2.3.4.bb b/packages/python/python_2.3.4.bb index de9c15c350..e6da09e48f 100644 --- a/packages/python/python_2.3.4.bb +++ b/packages/python/python_2.3.4.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native zlib gdbm" -PR = "ml4" +PR = "ml5" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ file://bindir-libdir.patch;patch=1 \ @@ -55,3 +55,4 @@ do_install() { } include python-${PV}-manifest.inc +RPROVIDES_python-core = "python" diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 7d3856d719..600bee2df6 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml0" +PR = "ml1" PYTHON_MAJMIN = "2.4" @@ -62,6 +62,6 @@ do_install() { include python-${PV}-manifest.inc +RPROVIDES_python-core = "python" PACKAGES =+ "libpython2" FILES_libpython2 = "${libdir}/libpython*" - diff --git a/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch b/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch new file mode 100644 index 0000000000..19a5c134c8 --- /dev/null +++ b/packages/qte/qte-2.3.12/fix-errno-exception-spec.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qsoundqss_qws.cpp~fix-errno-exception-spec.patch ++++ qt-2.3.10/src/kernel/qsoundqss_qws.cpp +@@ -51,8 +51,6 @@ + #include <sys/ioctl.h> + #include <sys/soundcard.h> + +-extern int errno; +- + #define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0 + #define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0 + diff --git a/packages/qte/qte-2.3.12/fix-native-build.patch b/packages/qte/qte-2.3.12/fix-native-build.patch deleted file mode 100644 index 7670d44f27..0000000000 --- a/packages/qte/qte-2.3.12/fix-native-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-2.3.10/src/kernel/qwindowsystem_qws.h.orig 2005-09-19 17:50:39.000000000 +0200 -+++ qt-2.3.10/src/kernel/qwindowsystem_qws.h 2005-09-19 17:50:45.000000000 +0200 -@@ -53,6 +53,8 @@ - class QWSRegionManager; - class QGfx; - class QWSServerData; -+class QWSInputMethod; -+class QWSGestureMethod; - - class QWSInternalWindowInfo - { diff --git a/packages/qte/qte-2.3.12/gcc4.patch b/packages/qte/qte-2.3.12/gcc4.patch new file mode 100644 index 0000000000..550effd7ba --- /dev/null +++ b/packages/qte/qte-2.3.12/gcc4.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- qt-2.3.10/src/tools/qvaluestack.h~gcc4 2005-01-23 15:00:47.000000000 +0100 ++++ qt-2.3.10/src/tools/qvaluestack.h 2006-03-19 02:32:56.000000000 +0100 +@@ -54,7 +54,7 @@ + { + T elem( this->last() ); + if ( !this->isEmpty() ) +- remove( this->fromLast() ); ++ this->remove( this->fromLast() ); + return elem; + } + T& top() { return this->last(); } diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index dafccc0823..822ee2402f 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" -PROVIDES = "virtual/qte virtual/libqte2" +PROVIDES = "virtual/libqte2" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" diff --git a/packages/qte/qte_2.3.12.bb b/packages/qte/qte-common_2.3.12.inc index 19940fa343..c4d584ac48 100644 --- a/packages/qte/qte_2.3.12.bb +++ b/packages/qte/qte-common_2.3.12.inc @@ -2,20 +2,22 @@ DESCRIPTION = "Qt/Embedded Version ${PV}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" -PROVIDES = "virtual/qte virtual/libqte2" +PROVIDES = "virtual/libqte2" -DEFAULT_PREFERENCE = "-1" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" -SRC_URI = "http://sunsite.rediris.es/mirror/Qt/snapshots/qt-embedded-2.3.10-snapshot-20060120.tar.gz \ +SRC_URI = "http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz \ file://qpe.patch;patch=1 \ file://vt-switch.patch;patch=1 \ file://daemonize.patch;patch=1 \ file://no-moc.patch;patch=1 \ file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1 \ file://c700-hardware.patch;patch=1 \ file://encoding.patch;patch=1 \ file://fix-qgfxraster.patch;patch=1 \ @@ -28,22 +30,22 @@ SRC_URI = "http://sunsite.rediris.es/mirror/Qt/snapshots/qt-embedded-2.3.10-snap file://fix-linuxfb-setmode.patch;patch=1 \ file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ file://fix-qscreen-sync.patch;patch=1 \ - file://improve-calibration-r0.patch;patch=1 \ + file://improve-calibration-r0.patch;patch=1 \ file://key.patch;patch=1 \ - file://bidimetrics.patch;patch=5 \ + file://bidimetrics.patch;patch=5 \ file://simpad-defaultkbd.patch;patch=1 \ + file://fix-errno-exception-spec.patch;patch=1 \ file://sharp_char.h \ file://switches.h " SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \ file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_spitz = "file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ file://mnci.patch;patch=1 \ file://mnci-touchscreen.patch;patch=1 \ @@ -53,9 +55,7 @@ SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_so SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " - S = "${WORKDIR}/qt-2.3.10-snapshot-20060120" - export QTDIR = "${S}" def qte_arch(d): @@ -96,7 +96,6 @@ EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" export SYSCONF_CC = "${CC}" @@ -121,10 +120,13 @@ do_configure_prepend_mnci() { ln -sf ${STAGING_BINDIR}/uic bin/uic } +# generate uclibc and eabi configurations do_configure() { for f in ${S}/configs/linux-*-g++-shared; do sed -e 's,-linux-,-linux-uclibc-,g' < $f \ > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` + sed -e 's,-linux-,-linux-gnueabi-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'` done echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } @@ -144,15 +146,16 @@ do_compile() { do_stage() { rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib rm -f include/qxt.h install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ + install -m 0644 src/kernel/qsnoopdata_qws_p.h ${STAGING_DIR}/${HOST_SYS}/qt2/include/ } do_install() { - oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/ + oe_libinstall -so -C lib lib${PN} ${D}${palmqtdir}/lib/ } PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb new file mode 100644 index 0000000000..ab0844135c --- /dev/null +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -0,0 +1,23 @@ +require qte-common_${PV}.inc +PR = "r0" + +EXTRA_OECONF += "-thread -static" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +do_stage() { + rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ +} + +do_install() { + : +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index eeed231496..6ca6566458 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,9 +1,7 @@ require qte-common_${PV}.inc - PR = "r0" -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif -thread -static \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" +EXTRA_OECONF += "-thread" export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" diff --git a/packages/qte/qte-mt_2.3.12.bb b/packages/qte/qte-mt_2.3.12.bb new file mode 100644 index 0000000000..6ca6566458 --- /dev/null +++ b/packages/qte/qte-mt_2.3.12.bb @@ -0,0 +1,9 @@ +require qte-common_${PV}.inc +PR = "r0" + +EXTRA_OECONF += "-thread" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 345a585254..25741931e6 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,2 +1,3 @@ require qte-common_${PV}.inc PR = "r40" + diff --git a/packages/sdlperl/sdl-perl_1.20.3.bb b/packages/sdlperl/sdl-perl_1.20.3.bb index d115f02ce3..80bd899dfc 100644 --- a/packages/sdlperl/sdl-perl_1.20.3.bb +++ b/packages/sdlperl/sdl-perl_1.20.3.bb @@ -1,14 +1,40 @@ -SECTION = "libs" DESCRIPTION = "Perl bindings for SDL" -SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \ - file://Makefile.patch;patch=1;pnum=0" -S = "${WORKDIR}/SDL_perl-${PV}" +HOMEPAGE = "http://bloodgate.com/perl" +SECTION = "libs" LICENSE = "GPL" DEPENDS = "perl virtual/libsdl libsdl-image libsdl-gfx libsdl-ttf libsdl-mixer libsdl-net smpeg" -inherit sdl +SRC_URI = "http://bloodgate.com/perl/sdl/pub/SDL_perl-${PV}.tar.gz \ + file://Makefile.patch;patch=1;pnum=0" +S = "${WORKDIR}/SDL_perl-${PV}" + +do_configure () { + if [ -x ${S}/configure ] ; then + cfgcmd="${S}/configure \ + -GL -GLU" + oenote "Running $cfgcmd..." + $cfgcmd || oefatal "oe_runconf failed" + if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then + . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh + sed -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:; s:\(SITEARCHEXP = \).*:\1${sitearchexp}:; s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5:; s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" < Makefile > Makefile.new + mv Makefile.new Makefile + fi + else + oefatal "no configure script found" + fi +} do_stage () { - install -d ${STAGING_LIBDIR}/perl5/vendor_perl - install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl + install -d ${STAGING_LIBDIR}/perl5/vendor_perl + install -m 0644 ${S}/lib/SDL.pm ${STAGING_LIBDIR}/perl5/vendor_perl +} + +do_compile () { + oe_runmake PASTHRU_INC="${CFLAGS}" } + +do_install () { + oe_runmake install_vendor +} + +FILES_${PN} += '${libdir}/perl5' |