From 0d240fc455c013943e170a70828d825ced38354e Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 23 Dec 2007 13:35:12 +0000 Subject: zaurus-updater: Fix spitz kernel install, display PR to the user & beautify HDD installer messages --- packages/zaurus-updater/zaurus-updater.bb | 7 +- packages/zaurus-updater/zaurus-updater/updater.sh | 178 ++++++++++++---------- 2 files changed, 106 insertions(+), 79 deletions(-) (limited to 'packages') diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index f98ece35d7..0bec6d3256 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r18" +PR = "r19" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -11,6 +11,11 @@ SRC_URI = "file://updater.sh \ file://gnu-tar.gz" S = "${WORKDIR}" +do_configure() { + cat "${S}/updater.sh" | sed "s/ZAURUS_UPDATER_VERSION/${PR}/" > "${S}/updater.sh_" + mv "${S}/updater.sh_" "${S}/updater.sh" +} + do_compile() { encdec-updater -e updater.sh } diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index 2efa946f6c..ed558be941 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -34,6 +34,11 @@ # - Reformatted file - please use spaces not tabs # - "version check" is only on Tosa and Poodle - breaks other machines # +# 2007.12.23 Matthias 'CoreDump' Hentges +# - Fix kernel install on spitz machines +# - Unify format of do_flashing()... +# - Display ${PR} of zaurus-updater.bb to the user +# - Polish HDD installer messages DATAPATH=$1 TMPPATH=/tmp/update @@ -120,16 +125,19 @@ check_for_tar() do_rootfs_extraction() { UNPACKED_ROOTFS=1 - echo 'HDD root file system' + echo 'Installing HDD root file system' if [ ! -f /hdd1/NotAvailable ]; then umount /hdd1 fi - echo 'Now formatting...' + echo -n '* Now formatting...' mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1 e2fsck -p /dev/${IDE1}1 > /dev/null if [ "$?" != "0" ]; then + echo "FAILED" echo "Error: Unable to create filesystem on microdrive!" exit "$?" + else + echo "Done" fi mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1 @@ -139,14 +147,17 @@ do_rootfs_extraction() fi cd /hdd1 - echo 'Now extracting...' + echo -n '* Now extracting (this can take over 5m)...' gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf - if [ "$?" != "0" ]; then + echo "FAILED" echo "Error: Unable to extract root filesystem archive!" exit "$?" + else + echo "Done" fi - echo 'Done.' + echo 'HDD Installation Finished.' # remount as RO cd / @@ -156,60 +167,67 @@ do_rootfs_extraction() do_flashing() { - if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ] - then - echo "Error: File is too big to flash!" - echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]" - return - fi - - if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ] - then - #check version - /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD - if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1 - then - #no version info... - rm -f $TMPHEAD > /dev/null 2>&1 - DATAPOS=0 - fi - fi - - if [ $ISFORMATTED = 0 ] - then - /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - ISFORMATTED=1 - fi - - echo '' - echo '0% 100%' - PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` - PROGSTEP=`expr 25 / $PROGSTEP` - if [ $PROGSTEP = 0 ] - then - PROGSTEP=1 - fi - - if [ -e $TMPHEAD ] - then - VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' - MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' - /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - fi - - # Looks like Akita is quite unique when it comes to kernel flashing + if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ] + then + echo "Error: File is too big to flash!" + echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]" + return + fi + + if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ] + then + #check version + /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD + + if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1 + then + #no version info... + rm -f $TMPHEAD > /dev/null 2>&1 + DATAPOS=0 + fi + fi + + if [ $ISFORMATTED = 0 ] + then + /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 + ISFORMATTED=1 + fi + + if [ -e $TMPHEAD ] + then + VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' + MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' + /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 + + /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 + /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 + fi + + # Looks like Akita and Spitz are unique when it comes to kernel flashing - if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then - echo $TARGETFILE':'$DATASIZE'bytes' - echo ' ' > /tmp/data - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 - else + if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ] + then +# echo $TARGETFILE':'$DATASIZE'bytes' + echo "" + echo -n "Installing SL-Cxx00 kernel..." + echo ' ' > /tmp/data + test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 + test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 + echo "Done" + else + + echo '' + echo '0% 100%' + PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` + PROGSTEP=`expr 25 / $PROGSTEP` + + if [ $PROGSTEP = 0 ] + then + PROGSTEP=1 + fi + #loop while [ $DATAPOS -lt $DATASIZE ] do @@ -246,27 +264,29 @@ do_flashing() done done fi - echo '' - - #finish - rm -f $TMPPATH/*.bin > /dev/null 2>&1 - - if [ $RESULT = 0 ] - then - if [ -e $VTMPNAME ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - rm -f $VTMPNAME > /dev/null 2>&1 - fi - if [ -e $MTMPNAME ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - fi - echo 'Done.' - else - echo 'Error!' - fi + echo '' + + #finish + rm -f $TMPPATH/*.bin > /dev/null 2>&1 + + if [ $RESULT = 0 ] + then + if [ -e $VTMPNAME ] + then + /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 + rm -f $VTMPNAME > /dev/null 2>&1 + fi + + if [ -e $MTMPNAME ] + then + /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 + rm -f $MTMPNAME > /dev/null 2>&1 + fi + + [ "$FLASH_TYPE" != "kernel" ] && echo 'Done.' + else + echo 'Error!' + fi } ### Check model ### @@ -300,6 +320,8 @@ case "$MODEL" in ;; esac +clear +echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----" echo 'MODEL: '$MODEL' ('$ZAURUS')' mkdir -p $TMPPATH > /dev/null 2>&1 -- cgit v1.2.3 From 6ba680ff816e3aa8ce41a7207d9134e33d57c618 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 23 Dec 2007 16:17:53 +0000 Subject: evas cvs add RRECOMMENDS to the usually used set of engines and loaders --- packages/efl1/evas.inc | 14 ++++++++++++++ packages/efl1/evas_cvs.bb | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 179f03b0d8..608c897295 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -35,3 +35,17 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" FILES_${PN} = "${libdir}/libevas*.so*" PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*" + +RRECOMMENDS_${PN} = "\ + libevas-engine-buffer \ + libevas-engine-fb \ + libevas-engine-software-generic \ + libevas-engine-software-x11 \ + libevas-engine-software-16 \ + libevas-engine-xrender-x11 \ + \ + libevas-loader-png \ + libevas-loader-jpeg \ + libevas-loader-eet \ + libevas-loader-svg \ +" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index 1bacbe3d1c..e386d307ad 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r3" +PR = "r4" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ -- cgit v1.2.3 From 4ed7dcd9c14c3cade5201d1599aceb5170998d7a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 23 Dec 2007 16:18:10 +0000 Subject: etk cvs RRECOMMMEND its engines --- packages/efl1/etk_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb index ad959edef6..238d640a68 100644 --- a/packages/efl1/etk_cvs.bb +++ b/packages/efl1/etk_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun DEPENDS = "evas ecore edje" LICENSE = "MIT" PV = "0.1.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library @@ -15,3 +15,4 @@ FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}" FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la" FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/" +RRECOMMENDS_${PN} = "${PN}-engines" -- cgit v1.2.3 From 86a054ca3436c3622d40767596dba560053c9218 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 23 Dec 2007 16:18:22 +0000 Subject: ewl cvs RRECOMMENDS its engines --- packages/efl1/ewl_cvs.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 8fb8521d62..193efcbe18 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -2,10 +2,9 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library \ based on the enlightenment foundation libraries." DEPENDS = "evas ecore edje emotion efreet epsilon" -RSUGGESTS_${PN} += "ewl-themes" LICENSE = "MIT" PV = "0.5.1+cvs${SRCDATE}" -PR = "r1" +PR = "r2" inherit efl_library @@ -31,3 +30,5 @@ FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" + +RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes" -- cgit v1.2.3 From 2c7f8fcc887ecc9ccb2bead8353f30521904de6f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 23 Dec 2007 16:18:34 +0000 Subject: zaurus-updater: use sed -i instead of shuffling files around --- packages/zaurus-updater/zaurus-updater.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index 0bec6d3256..fb4d6e2584 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -12,8 +12,7 @@ SRC_URI = "file://updater.sh \ S = "${WORKDIR}" do_configure() { - cat "${S}/updater.sh" | sed "s/ZAURUS_UPDATER_VERSION/${PR}/" > "${S}/updater.sh_" - mv "${S}/updater.sh_" "${S}/updater.sh" + sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh" } do_compile() { -- cgit v1.2.3 From a725469aa29c5adfef01f8133a9dc3a57c2c669c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 23 Dec 2007 16:19:18 +0000 Subject: epdf cvs update fix-plugin-patch-check --- packages/efl1/epdf/fix-plugin-path-check.patch | 24 ++++++++++++------------ packages/efl1/epdf_cvs.bb | 3 +-- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch index dd5469c286..b218fffb7a 100644 --- a/packages/efl1/epdf/fix-plugin-path-check.patch +++ b/packages/efl1/epdf/fix-plugin-path-check.patch @@ -2,18 +2,18 @@ Index: epdf/configure.in =================================================================== --- epdf.orig/configure.in +++ epdf/configure.in -@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL, - [ - have_ewl="yes" - requirements="$requirements ewl" -- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" -- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" -+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" -+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" - AC_SUBST(EWL_TEST_LIBS_DIR) - AC_SUBST(EWL_TEST_SOURCE_DIR) - ], -@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON, +@@ -95,8 +95,8 @@ + [ + have_ewl="yes" + requirements="$requirements ewl" +- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" +- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" ++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" ++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" + AC_SUBST(EWL_TEST_LIBS_DIR) + AC_SUBST(EWL_TEST_SOURCE_DIR) + ], +@@ -144,7 +144,7 @@ [ have_epsilon="yes" requirements="$requirements epsilon imlib2" diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 8426b75a17..7ca33bf9d8 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "BSD" -DEPENDS = "poppler0.6 evas ecore etk ewl" +DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" - PR = "r1" inherit efl_library -- cgit v1.2.3 From 40d4ae6f75eb1a8f45f5f5d71e96c9c8fa6a2e69 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 23 Dec 2007 16:23:32 +0000 Subject: zaurusd: Make hinge scripts independent from bl. --- packages/zaurusd/files/zaurus-hinge.bl-off | 15 +++++---- packages/zaurusd/files/zaurus-hinge.bl-on | 51 ++++++++++++++++++------------ packages/zaurusd/zaurusd_svn.bb | 2 +- 3 files changed, 40 insertions(+), 28 deletions(-) (limited to 'packages') diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off index ec3cefb2ca..ba6746ce1b 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-off +++ b/packages/zaurusd/files/zaurus-hinge.bl-off @@ -6,13 +6,14 @@ # Filename: zaurus-hinge.bl-off # Date: 04-Jun-06 -#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -#${ZD_BINDIR}/bl off - - -STEP=5 DRIVER="`ls /sys/class/backlight/|head -n 1`" BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" -cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp -echo 0 > "$BRIGHTNESS_FILE" +if mkdir /var/run/display_brightness.lock +then + cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp + echo 0 > "$BRIGHTNESS_FILE" + rm -rf /var/run/display_brightness.lock +else + echo "BRIGHTNESS IS LOCKED" +fi diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on index 61598155f2..58227e8c5a 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-on +++ b/packages/zaurusd/files/zaurus-hinge.bl-on @@ -7,24 +7,39 @@ # Date: 04-Jun-06 test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -${ZD_BINDIR}/bl on +test -x ${ZD_BINDIR}/bl && ${ZD_BINDIR}/bl on -# If the backlight does not come back on after a suspend, the driver is -# still "on" (hence "bl on" does nothing) with a brightness of "0" -( if test "`bl | awk '{print $2}'`" = "0" -then - x=0 - while test "$x" != 4 - do - bl 10 - usleep 10 - bl 50 - usleep 10 - - let x=$x+1 - done +BL="fakeBl" + +fakeBl() { + + + case "$1" in + on) test -n "$2" && echo "$2" > "$BL_DRIVER" ;; + "") echo "on `cat "$BL_DRIVER"`";; + *) echo "$1" > "$BL_DRIVER" ;; + esac +} + +for dir in `ls -1 /sys/class/backlight/` +do + if test -e /sys/class/backlight/$dir/brightness + then + echo "Using [$dir] backlight driver" + BL_DRIVER="/sys/class/backlight/$dir/brightness" + break + fi +done + + +echo "### `$BL` ###" +( if test "`$BL | awk '{print $2}'`" = "0" +then + + $BL 20 + if mkdir /var/run/display_brightness.lock then if test -e /var/run/display_brightness.tmp @@ -34,12 +49,8 @@ then if test "$OLD_VALUE" -gt 1 then - STEP=5 - DRIVER="`ls /sys/class/backlight/|head -n 1`" - BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" - echo "SETTING $OLD_VALUE!" - echo "$OLD_VALUE" > "$BRIGHTNESS_FILE" + $BL "$OLD_VALUE" rm /var/run/display_brightness.tmp echo "FINISH!" fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 8bc0b2ba58..8801974fc9 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r14" +PR = "r15" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ -- cgit v1.2.3 From 4169220a9f970264b6b1ff75bfd065c380827a83 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Sun, 23 Dec 2007 19:03:25 +0000 Subject: xscreensaver: Fix QA issue in do_configure --- .../configure.in-includedir.patch | 72 ++++++++++++++++++++++ packages/xscreensaver/xscreensaver_4.22.bb | 5 ++ 2 files changed, 77 insertions(+) create mode 100644 packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch (limited to 'packages') diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch new file mode 100644 index 0000000000..723d8bd956 --- /dev/null +++ b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch @@ -0,0 +1,72 @@ +--- xscreensaver-4.22/configure.in.orig 2007-12-23 18:33:43.000000000 +0000 ++++ xscreensaver-4.22/configure.in 2007-12-23 18:35:33.000000000 +0000 +@@ -944,9 +944,6 @@ + # + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -955,9 +952,6 @@ + # + AC_DEFUN(AC_EGREP_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_EGREP_HEADER([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -966,9 +960,6 @@ + # + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -982,9 +973,6 @@ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +@@ -1005,9 +993,6 @@ + # + AC_DEFUN(AC_TRY_X_RUN, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_RUN([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -2763,9 +2748,6 @@ + EOF + + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:` +@@ -3395,9 +3377,6 @@ + DEPEND_DEFINES= + + +-if test \! -z "$includedir" ; then +- INCLUDES="$INCLUDES -I$includedir" +-fi + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index 6c2776d6aa..cac3776724 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -8,9 +8,12 @@ SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" +PR = "r1" + SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://fixes.patch;patch=1 \ file://configure.in.patch;patch=1 \ + file://configure.in-includedir.patch;patch=1 \ file://XScreenSaver" # xscreensaver-demo is a glade app @@ -35,6 +38,8 @@ FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*" do_configure_prepend() { sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in + + export includedir="/lib" } do_compile() { -- cgit v1.2.3 From ca879040e453c64b80fdcc4d86931f1fe428d955 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 23 Dec 2007 19:33:40 +0000 Subject: gammu: updated to 1.17.0 --- packages/gammu/gammu_1.13.0.bb | 33 --------------------------------- packages/gammu/gammu_1.17.0.bb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 packages/gammu/gammu_1.13.0.bb create mode 100644 packages/gammu/gammu_1.17.0.bb (limited to 'packages') diff --git a/packages/gammu/gammu_1.13.0.bb b/packages/gammu/gammu_1.13.0.bb deleted file mode 100644 index fc7adb1b79..0000000000 --- a/packages/gammu/gammu_1.13.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs cmake-native" -LICENSE = "GPL" -HOMEPAGE = "http://www.gammu.org/" - -SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 " - -inherit pkgconfig - -do_configure() { - cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup -} - -do_compile () { - oe_runmake -} - -do_install () { - oe_runmake install DESTDIR=${D} -} - -do_stage() { - install -d ${STAGING_INCDIR}/gammu/ - install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/ - - oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR} -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu" -FILES_libgammu = "${libdir}/libGammu.so*" diff --git a/packages/gammu/gammu_1.17.0.bb b/packages/gammu/gammu_1.17.0.bb new file mode 100644 index 0000000000..fc7adb1b79 --- /dev/null +++ b/packages/gammu/gammu_1.17.0.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "GNU All Mobile Managment Utilities" +SECTION = "console/network" +DEPENDS = "bluez-libs cmake-native" +LICENSE = "GPL" +HOMEPAGE = "http://www.gammu.org/" + +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 " + +inherit pkgconfig + +do_configure() { + cd ${S} && CMAKE_C_COMPILER=${TARGET_OS}-gcc ./configure --prefix=${prefix} --enable-shared --enable-backup +} + +do_compile () { + oe_runmake +} + +do_install () { + oe_runmake install DESTDIR=${D} +} + +do_stage() { + install -d ${STAGING_INCDIR}/gammu/ + install -m 0644 build-configure/include/*.h ${STAGING_INCDIR}/gammu/ + + oe_libinstall -so -C build-configure/common libGammu ${STAGING_LIBDIR} +} + +PACKAGES =+ "libgammu" + +FILES_${PN} = "${bindir}/gammu" +FILES_libgammu = "${libdir}/libGammu.so*" -- cgit v1.2.3 From 163aa1a4317c5ba9284faa2a5d23e333d988f2bc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 23 Dec 2007 19:45:15 +0000 Subject: python-gammu: updated to 0.24 --- packages/python/python-gammu_0.21.bb | 10 ---------- packages/python/python-gammu_0.24.bb | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 packages/python/python-gammu_0.21.bb create mode 100644 packages/python/python-gammu_0.24.bb (limited to 'packages') diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.21.bb deleted file mode 100644 index f8989d9181..0000000000 --- a/packages/python/python-gammu_0.21.bb +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Python bindings for the gammu GSM phone communication library." -HOMEPAGE = "http://cihar.com/gammu/python" -SECTION = "devel/python" -DEPENDS = "gammu" -LICENSE = "GPL" -PR = "ml0" - -SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" - -inherit distutils diff --git a/packages/python/python-gammu_0.24.bb b/packages/python/python-gammu_0.24.bb new file mode 100644 index 0000000000..f8989d9181 --- /dev/null +++ b/packages/python/python-gammu_0.24.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Python bindings for the gammu GSM phone communication library." +HOMEPAGE = "http://cihar.com/gammu/python" +SECTION = "devel/python" +DEPENDS = "gammu" +LICENSE = "GPL" +PR = "ml0" + +SRC_URI = "http://dl.cihar.com/python-gammu/latest/python-gammu-${PV}.tar.bz2" + +inherit distutils -- cgit v1.2.3