diff options
140 files changed, 3185 insertions, 275 deletions
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index 71fa76010f..0cebdea244 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -136,7 +136,7 @@ python write_specfile() { bb.build.exec_func('BUILDSPEC', d) # move the rpm into the pkgoutdir - rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) + rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d) outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d) bb.movefile(rpm, outrpm) } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 5d4ec2b39b..0caa162f67 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -322,7 +322,6 @@ SDK_PATH = "/usr/local/${SDK_NAME}" # Kernel info. ################################################################## -OLDEST_KERNEL = "2.4.0" STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/kernel" ################################################################## @@ -657,6 +656,8 @@ require conf/enterprise.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +OLDEST_KERNEL ?= "2.4.0" + DL_DIR ?= "${TMPDIR}/downloads" IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" diff --git a/conf/checksums.ini b/conf/checksums.ini index 2d7e77c515..03624c2661 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5078,6 +5078,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc md5=59033388df36987d2b9c9bbf7e19bd57 sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc +[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.5.tar.gz] +md5=e218df6c84fc17c1126d31de9472a76c +sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198 + [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz] md5=c7545bb05e0c2fc59174f0dc455c6519 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703 @@ -5122,6 +5126,10 @@ sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56 md5=258d0a8277ace7fab06c55fdb2b249c4 sha256=2de57ec75aca127ec70c2797c1a416fca43d78e6cb5c8ee4938864cb8eaafb56 +[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.41.5.tar.gz] +md5=c75f112d24bdc39c76dbec61d59a4a91 +sha256=dc1eb1b7bbad2edc030e50e7506c79562d98098f99a5d6cb5db5aa5ca92ffe48 + [http://www.pobox.com/~sheff/sw/e2tools/e2tools-0.0.16.tar.gz] md5=1829b2b261e0e0d07566066769b5b28b sha256=4e3c8e17786ccc03fc9fb4145724edf332bb50e1b3c91b6f33e0e3a54861949b @@ -6102,6 +6110,10 @@ sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 md5=2bfc127cdda02834d0491ab531a20960 sha256=ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0 +[http://downloads.sourceforge.net/flac/flac-1.2.1.tar.gz] +md5=153c8b15a54da428d1f0fadc756c22c7 +sha256=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf + [http://fpdownload.macromedia.com/get/flashplayer/current//flash-plugin-10.0.12.36-release.i386.rpm] md5=8845d4536fcd3a329690c93bce9bbf8e sha256=c7345faf10b269b3556f2e1373c4afc35f08891f8bbd54e45d49151a8c8e4ac0 @@ -8174,6 +8186,10 @@ sha256=74846344de2c24a76408ee9c598dbc75d6c33a02f888f8b5491cb1af9a097cb4 md5=37242776b08625fa10c73c18b790e552 sha256=e8ee6534bd142ee0ed55134a5eb95f6e7f4b8640df2d3669ebd202f6d82f9a0d +[http://gnome-mplayer.googlecode.com/files/gnome-mplayer-0.5.3.tar.gz] +md5=d4c9de56f77f5cd86ac67ab53e027181 +sha256=8823fe08890b287684c3c16fe06d1be4a3c299bd8bcd9a5ca49063ce8a88a9ef + [http://www.packagekit.org/releases/gnome-packagekit-0.2.3.tar.gz] md5=eb12e6eea8413d35c033aedee61b89ee sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0 @@ -10078,6 +10094,10 @@ sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3 md5=750cf074e88b6fb7012f26d99cd39b9b sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90 +[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz] +md5=bb7c36e142437f7363f9a80ae8391926 +sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02 + [http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz] md5=3b351822ba359669646026013a3d5a03 sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17 @@ -10122,6 +10142,10 @@ sha256=120e6b8019b5d608038d8f9a5a14bb97c4162b803118bb8530d9735d65b553a9 md5=6fc99d15d38945c17a291ea93e664664 sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0 +[http://hal.freedesktop.org/releases/hal-info-20090414.tar.gz] +md5=ae7177ab8f0163d3ef2df71f0de2b357 +sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f + [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz] md5=488b0f2f346361bba7996b459c5d7b6f sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3 @@ -12398,6 +12422,10 @@ sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c md5=f619b4f01aeda6d5f2679be9dcec5a51 sha256=ae2d5d228a1251666f9f80248178b40fb22513597cf78b976e4c3f15d8fc260c +[http://downloads.sourceforge.net/libassa/libassa-3.5.0.tar.gz] +md5=9b61dfd94bf4e083829ffb0231243d8b +sha256=72a627c74e82ff679cb16ebe3a625b9032d8d1feed4c1da63ebb5106a80b1314 + [ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-0.6.7.tar.gz] md5=db4e6939fafbaae80cab11a67f28771d sha256=c72dc7b2a3bb2945d1fb693b401ddff44f3eefbe248f2e6d29c86487b69c1dd4 @@ -13514,6 +13542,10 @@ sha256=f7054f93c57ba6b758d0e4f47d4d2dd96a7fe487e1157eb70a4d642910275aea md5=6a4db221129f230c64a0f937d00bb703 sha256=003c44be21859d1495c0571e249ce17edd5ac58636f67b6a8bc4f395a6c7e6a2 +[ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.2.tar.gz] +md5=2853d8f32417e3c5f3b18fda38f96e52 +sha256=1e095469f7d159e5b9c91106484e10f0b3ce3265c55b9864407bd4ea5952111f + [http://mikmod.raphnet.net/files/libmikmod-3.1.11.tar.gz] md5=705106da305e8de191549f1e7393185c sha256=2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929 @@ -17266,6 +17298,10 @@ sha256=58782b11423359f2a247f0217aab6fe041f32984aac1f411da6d43bd34cfd0db md5=917f4e05f3982bd7fceaede197f0e1d4 sha256=d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b +[http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz] +md5=03938f17646efbb50aa70ba5f99f51d7 +sha256=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d + [http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.7.tar.gz] md5=f384fb230145f90fb75df1e33062583f sha256=3c45afef8390d8eae65e1415f7de159b7fdcef649218238a6cac8e9952fde7d5 @@ -23462,6 +23498,10 @@ sha256=e67d86683adef0855220b6f5a4b7ca2c51a15faa142e2ecd69925ede76854a4d md5=23f227da49df36f33fe47e917e332cd8 sha256=7736d8d7d3b39654e350416585b3e00af9f55670cce8b3dddd2c2494cbaae81c +[http://kernel.org/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-2.15.tar.bz2] +md5=71919b69eeecbba05612224d8f2c450f +sha256=db4dcbf99d989a8f539d7521e9e64047367fa2ccdcbb91517cdec19693a41ffd + [http://xorg.freedesktop.org/releases/individual/util/util-macros-1.1.5.tar.bz2] md5=51952682d8b42aeda3af5cee0133ce2c sha256=75939790e16b8bcc122e83f3f060d6f000ed1a98e97b4972fac0903142f5651b @@ -27206,6 +27246,14 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6 md5=791e8986c6e16dcd1c9878126725e06b sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119 +[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2] +md5=b9989582ea43f8fd58819d85ef9c9bc5 +sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 + +[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.26/zenity-2.26.0.tar.bz2] +md5=6660ce6dac0a6ca495a0e954cb6b40a2 +sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1 + [http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz] md5=31ac40fdaf24b3e666ed83c1320dd7a5 sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index bb50220f29..3432db42b5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,6 +20,8 @@ DISTRO_VERSION = "2009.X-test-${DATE}" DISTRO_REVISION = "2" DISTRO_PR = ".2" +OLDEST_KERNEL ?= "2.6.18" + #build staging from packages INHERIT += "packaged-staging" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index add9586c7e..8d2bc93359 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -78,6 +78,7 @@ SRCREV_pn-gnuradio ?= "10302" SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" +SRCREV_pn-gpe-mini-browser2 ?= "9900" SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 9f48f750e7..bb4fa7eaf0 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r33" +MACHINE_KERNEL_PR = "r34" KERNEL_IMAGETYPE = "uImage" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index e9026f77f8..a3fe9b9e6b 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,7 @@ fi for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ @@ -347,6 +347,7 @@ do xserver-xorg \ zauralign \ zddice \ + zenity \ zgscore \ zhone \ ziq \ @@ -371,7 +372,7 @@ fi for machine in ${MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS="task-base task-boot \ task-opie task-opie-all \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh index 609f16a938..593cf13fba 100644 --- a/contrib/angstrom/upload-packages.sh +++ b/contrib/angstrom/upload-packages.sh @@ -36,7 +36,7 @@ rm -f upload-queue/ti*codec* upload-queue/*3.00.* # Copy over non-duplicate files echo "Starting rsync..." -rsync -vz --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ +rsync -vz --partial --copy-links --progress --files-from=files-trans upload-queue/ $REMOTEM:$REMOTED/unsorted/ # Clean up temporary files echo "Removing upload queue" diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc index cbd6ac3d03..f5e68e26fe 100644 --- a/recipes/avahi/avahi.inc +++ b/recipes/avahi/avahi.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" # uclibc has no nss -RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" +RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns" RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d" RDEPENDS_avahi-autoipd += "update-rc.d" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb index 15f56ffa95..61a62a54a4 100644 --- a/recipes/avahi/avahi_0.6.24.bb +++ b/recipes/avahi/avahi_0.6.24.bb @@ -1,5 +1,7 @@ require avahi.inc +PR = "r1" + DEPENDS += "intltool-native" PACKAGES =+ "libavahi-gobject" diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 9efa6d1d70..8b214c13bd 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -12,6 +12,16 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ S = "${WORKDIR}/e2fsprogs-libs-${PV}" FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +FILES_${PN} = "${bindir}" + +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) +} do_stage () { for i in libcom_err libss libuuid libblkid; do diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb new file mode 100644 index 0000000000..25a6490c7c --- /dev/null +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs_1.41.5.bb @@ -0,0 +1,14 @@ +require e2fsprogs-libs.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://mkinstalldirs.patch;patch=1 \ + " + +DEPENDS = "gettext-native" + +EXTRA_OECONF=" --enable-elf-shlibs " + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch b/recipes/e2fsprogs-libs/files/mkinstalldirs.patch index a32140eb93..a32140eb93 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs-1.41.2/mkinstalldirs.patch +++ b/recipes/e2fsprogs-libs/files/mkinstalldirs.patch diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb index f2c3898dbe..e79958cb2f 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -2,7 +2,7 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" EXTRA_OECONF = "" @@ -12,5 +12,9 @@ PACKAGES = "" DEPENDS = "" do_stage () { - oe_runmake install + oe_runmake install + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done } diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb new file mode 100644 index 0000000000..b29064f5c8 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb @@ -0,0 +1,19 @@ +SECTION = "base" +require e2fsprogs.inc +inherit native + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +EXTRA_OECONF = "" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" +DEPENDS = "" + +do_stage () { + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done +} diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index b7a1223cc9..6821d71004 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -15,3 +15,8 @@ EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" PARALLEL_MAKE = "" + +e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ + e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" + + diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch index 759e84edb0..759e84edb0 100644 --- a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch +++ b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch diff --git a/recipes/e2fsprogs/e2fsprogs_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb new file mode 100644 index 0000000000..04b5d1daf5 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs_1.41.5.bb @@ -0,0 +1,125 @@ +require e2fsprogs.inc + +PR = "r1" + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +DEPENDS += "gettext-native" + +do_compile_prepend () { + find ./ -print|xargs chmod u=rwX + ( cd util; ${BUILD_CC} subst.c -o subst ) +} + +ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \ + ext2_types.h ext2_fs.h ext2_io.h \ + ext2fs.h" +e2pheaders = "e2p.h" + +do_stage () { + oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/ + oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/e2p + for h in ${e2pheaders}; do + install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h" + done + install -d ${STAGING_INCDIR}/ext2fs + for h in ${ext2fsheaders}; do + install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h" + done + autotools_stage_all +} + +# blkid used to be part of e2fsprogs but is useful outside, add it +# as an RDEPENDS so that anything relying on it being in e2fsprogs +# still works +RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks" + +FILES_${PN} += "${libdir}/e2initrd_helper" + +PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks" +FILES_e2fsprogs-blkid = "${base_sbindir}/blkid.${PN}" +FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen" +FILES_e2fsprogs-fsck = "${base_sbindir}/fsck.${PN}" +FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck.${PN} ${base_sbindir}/fsck.ext*.${PN}" +FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.${PN} ${base_sbindir}/mkfs.ext*.${PN}" +FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" + +do_install_append () { + mv ${D}${base_sbindir}/fsck ${D}${base_sbindir}/fsck.${PN} + mv ${D}${base_sbindir}/blkid ${D}${base_sbindir}/blkid.${PN} + mv ${D}${base_sbindir}/e2fsck ${D}${base_sbindir}/e2fsck.${PN} + rm ${D}${base_sbindir}/fsck.ext2 + rm ${D}${base_sbindir}/fsck.ext3 + rm ${D}${base_sbindir}/fsck.ext4* + mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.${PN} + rm ${D}${base_sbindir}/mkfs.ext2 + rm ${D}${base_sbindir}/mkfs.ext3 + rm ${D}${base_sbindir}/mkfs.ext4* + + cd ${D}/${base_sbindir} + ln -sf ./e2fsck.${PN} fsck.ext2.${PN} + ln -sf ./e2fsck.${PN} fsck.ext3.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4.${PN} + ln -sf ./e2fsck.${PN} fsck.ext4dev.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext2.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext3.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4.${PN} + ln -sf ./mke2fs.${PN} mkfs.ext4dev.${PN} + + ln -sf ./tune2fs findfs + ln -sf ./tune2fs e2label +} + +pkg_postinst_e2fsprogs () { + update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100 +} + +pkg_postinst_e2fsprogs-fsck () { + update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100 +} + +pkg_prerm_e2fsprogs-fsck () { + update-alternatives --remove fsck fsck.${PN} +} + +pkg_postinst_e2fsprogs-blkid () { + update-alternatives --install ${base_sbindir}/blkid blkid blkid.${PN} 100 +} + +pkg_prerm_e2fsprogs-blkid () { + update-alternatives --remove blkid blkid.${PN} +} + +pkg_postinst_e2fsprogs-e2fsck () { + update-alternatives --install ${base_sbindir}/e2fsck e2fsck e2fsck.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext2 fsck.ext2 fsck.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext3 fsck.ext3 fsck.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4 fsck.ext4 fsck.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/fsck.ext4dev fsck.ext4dev fsck.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-e2fsck () { + update-alternatives --remove e2fsck e2fsck.${PN} + update-alternatives --remove fsck.ext2 fsck.ext2.${PN} + update-alternatives --remove fsck.ext3 fsck.ext3.${PN} + update-alternatives --remove fsck.ext4 fsck.ext4.${PN} + update-alternatives --remove fsck.ext4dev fsck.ext4dev.${PN} +} + +pkg_postinst_e2fsprogs-mke2fs () { + update-alternatives --install ${base_sbindir}/mke2fs mke2fs mke2fs.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext2 mkfs.ext2 mkfs.ext2.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext3 mkfs.ext3 mkfs.ext3.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4 mkfs.ext4 mkfs.ext4.${PN} 100 + update-alternatives --install ${base_sbindir}/mkfs.ext4dev mkfs.ext4dev mkfs.ext4dev.${PN} 100 +} + +pkg_prerm_e2fsprogs-mke2fs () { + update-alternatives --remove mke2fs mke2fs.${PN} + update-alternatives --remove mkfs.ext2 mkfs.ext2.${PN} + update-alternatives --remove mkfs.ext3 mkfs.ext3.${PN} + update-alternatives --remove mkfs.ext4 mkfs.ext4.${PN} + update-alternatives --remove mkfs.ext4dev mkfs.ext4dev.${PN} +} diff --git a/recipes/flac/flac.inc b/recipes/flac/flac.inc index 79fa504fec..cadc32ff33 100644 --- a/recipes/flac/flac.inc +++ b/recipes/flac/flac.inc @@ -1,10 +1,10 @@ DESCRIPTION = "FLAC is a Free Lossless Audio Codec." +HOMEPAGE = "http://flac.sourceforge.net" LICENSE = "BSD GPL" SECTION = "libs" DEPENDS = "libogg" SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ file://xmms.m4" inherit autotools @@ -27,50 +27,7 @@ do_configure () { } do_stage () { - install -d ${STAGING_DATADIR}/aclocal - - oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC - install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h - - install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h - install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h - install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h - install -m 0644 ${S}/src/libOggFLAC/libOggFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC libFLAC ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC - install -m 0644 ${S}/include/FLAC/export.h ${STAGING_INCDIR}/FLAC/export.h - install -m 0644 ${S}/include/FLAC/metadata.h ${STAGING_INCDIR}/FLAC/metadata.h - install -m 0644 ${S}/include/FLAC/all.h ${STAGING_INCDIR}/FLAC/all.h - install -m 0644 ${S}/include/FLAC/format.h ${STAGING_INCDIR}/FLAC/format.h - install -m 0644 ${S}/include/FLAC/stream_encoder.h ${STAGING_INCDIR}/FLAC/stream_encoder.h - install -m 0644 ${S}/include/FLAC/stream_decoder.h ${STAGING_INCDIR}/FLAC/stream_decoder.h - install -m 0644 ${S}/include/FLAC/ordinals.h ${STAGING_INCDIR}/FLAC/ordinals.h - install -m 0644 ${S}/include/FLAC/seekable_stream_encoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_encoder.h - install -m 0644 ${S}/include/FLAC/file_encoder.h ${STAGING_INCDIR}/FLAC/file_encoder.h - install -m 0644 ${S}/include/FLAC/seekable_stream_decoder.h ${STAGING_INCDIR}/FLAC/seekable_stream_decoder.h - install -m 0644 ${S}/include/FLAC/file_decoder.h ${STAGING_INCDIR}/FLAC/file_decoder.h - install -m 0644 ${S}/include/FLAC/assert.h ${STAGING_INCDIR}/FLAC/assert.h - install -m 0644 ${S}/include/FLAC/callback.h ${STAGING_INCDIR}/FLAC/callback.h - install -m 0644 ${S}/src/libFLAC/libFLAC.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libFLAC++ libFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/FLAC++ - install -m 0644 ${S}/include/FLAC++/export.h ${STAGING_INCDIR}/FLAC++/export.h - install -m 0644 ${S}/include/FLAC++/metadata.h ${STAGING_INCDIR}/FLAC++/metadata.h - install -m 0644 ${S}/include/FLAC++/all.h ${STAGING_INCDIR}/FLAC++/all.h - install -m 0644 ${S}/include/FLAC++/encoder.h ${STAGING_INCDIR}/FLAC++/encoder.h - install -m 0644 ${S}/include/FLAC++/decoder.h ${STAGING_INCDIR}/FLAC++/decoder.h - install -m 0644 ${S}/src/libFLAC++/libFLAC++.m4 ${STAGING_DATADIR}/aclocal/ - - oe_libinstall -a -so -C src/libOggFLAC++ libOggFLAC++ ${STAGING_LIBDIR}/ - install -d ${STAGING_INCDIR}/OggFLAC++ - install -m 0644 ${S}/include/OggFLAC++/export.h ${STAGING_INCDIR}/OggFLAC++/export.h - install -m 0644 ${S}/include/OggFLAC++/all.h ${STAGING_INCDIR}/OggFLAC++/all.h - install -m 0644 ${S}/include/OggFLAC++/encoder.h ${STAGING_INCDIR}/OggFLAC++/encoder.h - install -m 0644 ${S}/include/OggFLAC++/decoder.h ${STAGING_INCDIR}/OggFLAC++/decoder.h - install -m 0644 ${S}/src/libOggFLAC++/libOggFLAC++.m4 ${STAGING_DATADIR}/aclocal/ + autotools_stage_all } PACKAGES += "libflac libflac++ liboggflac liboggflac++" diff --git a/recipes/flac/flac_1.1.0.bb b/recipes/flac/flac_1.1.0.bb index debe8d73de..5bb0d6c3cf 100644 --- a/recipes/flac/flac_1.1.0.bb +++ b/recipes/flac/flac_1.1.0.bb @@ -1,3 +1,5 @@ require flac.inc -PR = "r6" +PR = "r7" + +SRC_URI += "file://disable-xmms-plugin.patch;patch=1" diff --git a/recipes/flac/flac_1.1.2.bb b/recipes/flac/flac_1.1.2.bb index 69eb07125e..70d30c98d7 100644 --- a/recipes/flac/flac_1.1.2.bb +++ b/recipes/flac/flac_1.1.2.bb @@ -1,6 +1,8 @@ require flac.inc -PR = "r6" +PR = "r7" + +SRC_URI += "file://disable-xmms-plugin.patch;patch=1" do_configure_append () { # removes '-read-only-relocs' which is enabled for PowerPC builds. diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb new file mode 100644 index 0000000000..94f24fc169 --- /dev/null +++ b/recipes/flac/flac_1.2.1.bb @@ -0,0 +1,3 @@ +require flac.inc + +PR = "r0" diff --git a/recipes/gnome/zenity/fingerscroll.patch b/recipes/gnome/zenity/fingerscroll.patch new file mode 100644 index 0000000000..785d179f03 --- /dev/null +++ b/recipes/gnome/zenity/fingerscroll.patch @@ -0,0 +1,102 @@ +diff --git a/src/tree.c b/src/tree.c +index 6dd3f64..32e4826 100644 +--- a/src/tree.c ++++ b/src/tree.c +@@ -46,6 +46,9 @@ static gboolean zenity_tree_column_is_hidden (gint column_index); + static void zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data); + static void zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path, + GtkTreeViewColumn *tree_col, gpointer data); ++static void zenity_tree_drag_start (GtkWidget *widget, GdkEventButton *event, gpointer data); ++static void zenity_tree_drag (GtkWidget *widget, GdkEventMotion *event, gpointer data); ++static void zenity_tree_drag_stop (GtkWidget *widget, GdkEventButton *event, gpointer data); + + static gboolean + zenity_tree_dialog_untoggle (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +@@ -353,7 +356,12 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data) + if (!(tree_data->radiobox || tree_data->checkbox)) + g_signal_connect (G_OBJECT (tree_view), "row-activated", + G_CALLBACK (zenity_tree_row_activated), data); +- ++ ++ /* Connect drag-drop signals for finger scrolling */ ++ tree_data->is_scrolling=FALSE; ++ g_signal_connect (G_OBJECT (tree_view), "motion-notify-event", ++ G_CALLBACK (zenity_tree_drag), tree_data); ++ + /* Create an empty list store */ + model = g_object_new (GTK_TYPE_LIST_STORE, NULL); + +@@ -685,3 +693,56 @@ zenity_tree_extract_column_indexes (char *indexes, int n_columns) + + return result; + } ++void ++zenity_tree_drag_start (GtkWidget *widget, GdkEventButton *event, gpointer data) ++{ ++ ZenityTreeData *zen_data=data; ++ zen_data->is_scrolling=TRUE; ++ zen_data->start_scroll_x=event->x; ++ zen_data->start_scroll_y=event->y; ++ ++ GtkTreeView *tree_view=GTK_TREE_VIEW(widget); ++ zen_data->start_scroll_v_adjustment= ++ gtk_adjustment_get_value (gtk_tree_view_get_vadjustment(tree_view)); ++ zen_data->start_scroll_h_adjustment= ++ gtk_adjustment_get_value (gtk_tree_view_get_hadjustment(tree_view)); ++ zen_data->last_scroll_time=event->time; ++} ++ ++void ++zenity_tree_drag (GtkWidget *widget, GdkEventMotion *event, gpointer data) ++{ ++ ZenityTreeData *zen_data=data; ++ ++ if ((event->state & GDK_BUTTON1_MASK) && ++ (event->time-zen_data->last_scroll_time>50)) ++ { ++ if (!zen_data->is_scrolling) ++ zenity_tree_drag_start(widget,event,data) ; ++ ++ ++ gint dy=event->y-zen_data->start_scroll_y; ++ gint dx=event->x-zen_data->start_scroll_x; ++ ++ GtkTreeView *tree_view=GTK_TREE_VIEW(widget); ++ GtkAdjustment *vAdjustment = gtk_tree_view_get_vadjustment(tree_view); ++ GtkAdjustment *hAdjustment = gtk_tree_view_get_hadjustment(tree_view); ++ gtk_adjustment_set_value (vAdjustment, ++ CLAMP (zen_data->start_scroll_v_adjustment-dy, ++ vAdjustment->lower, ++ vAdjustment->upper - vAdjustment->page_size)); ++ gtk_adjustment_set_value (hAdjustment, ++ CLAMP (zen_data->start_scroll_h_adjustment-dx, ++ hAdjustment->lower, ++ hAdjustment->upper - hAdjustment->page_size)); ++ zen_data->last_scroll_time=event->time; ++ } ++ if (zen_data->is_scrolling && !(event->state & GDK_BUTTON1_MASK)) ++ zenity_tree_drag_stop(widget,event,data); ++} ++void ++zenity_tree_drag_stop (GtkWidget *widget, GdkEventButton *event, gpointer data) ++{ ++ ZenityTreeData *zen_data=data; ++ zen_data->is_scrolling=FALSE; ++} +diff --git a/src/zenity.h b/src/zenity.h +index ac6c4f8..d40d8df 100644 +--- a/src/zenity.h ++++ b/src/zenity.h +@@ -113,6 +113,12 @@ typedef struct { + gboolean editable; + gchar *print_column; + gchar *hide_column; ++ gint start_scroll_x; ++ gint start_scroll_y; ++ gdouble start_scroll_v_adjustment; ++ gdouble start_scroll_h_adjustment; ++ gboolean is_scrolling; ++ guint32 last_scroll_time; + const gchar **data; + } ZenityTreeData; + diff --git a/recipes/gnome/zenity/makefile.patch b/recipes/gnome/zenity/makefile.patch new file mode 100644 index 0000000000..9bdd5dd08e --- /dev/null +++ b/recipes/gnome/zenity/makefile.patch @@ -0,0 +1,13 @@ +diff -c -r patcher_original/zenity-2.20.1/src/Makefile.am zenity-2.20.1/src/Makefile.am +*** patcher_original/zenity-2.20.1/src/Makefile.am Mon Nov 26 22:57:40 2007 +--- zenity-2.20.1/src/Makefile.am Thu Apr 2 00:31:39 2009 +*************** +*** 21,27 **** + zenity.h + + zenity_CPPFLAGS = \ +- -I$(includedir) \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DZENITY_DATADIR=\""$(pkgdatadir)"\" \ + $(AM_CPPFLAGS) +--- 21,26 ---- diff --git a/recipes/gnome/zenity/no-gnome-doc.patch b/recipes/gnome/zenity/no-gnome-doc.patch new file mode 100644 index 0000000000..6b2e2bd4b8 --- /dev/null +++ b/recipes/gnome/zenity/no-gnome-doc.patch @@ -0,0 +1,69 @@ +*** patcher_original/zenity-2.20.1/configure.in 2007-11-26 22:57:45.000000000 +0100 +--- zenity-2.20.1/configure.in 2009-04-10 23:08:11.000000000 +0200 +*************** +*** 8,14 **** + AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) + + GNOME_COMMON_INIT +! GNOME_DOC_INIT + + AM_MAINTAINER_MODE + +--- 8,14 ---- + AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip]) + + GNOME_COMMON_INIT +! #GNOME_DOC_INIT + + AM_MAINTAINER_MODE + +*** patcher_original/zenity-2.20.1/Makefile.am 2007-11-26 22:57:45.000000000 +0100 +--- zenity-2.20.1/Makefile.am 2009-04-10 23:30:20.000000000 +0200 +*************** +*** 1,8 **** + SUBDIRS = \ + src \ + po \ +! data \ +! help + + EXTRA_DIST = \ + autogen.sh \ +--- 1,8 ---- + SUBDIRS = \ + src \ + po \ +! data +! # help + + EXTRA_DIST = \ + autogen.sh \ +*************** +*** 16,28 **** + ChangeLog \ + NEWS \ + README \ +! AUTHORS \ +! gnome-doc-utils.make + + DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ +! intltool-update \ +! gnome-doc-utils.make + + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +--- 16,28 ---- + ChangeLog \ + NEWS \ + README \ +! AUTHORS +! # gnome-doc-utils.make + + DISTCLEANFILES = \ + intltool-extract \ + intltool-merge \ +! intltool-update +! # gnome-doc-utils.make + + DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --git a/recipes/gnome/zenity_2.26.0.bb b/recipes/gnome/zenity_2.26.0.bb new file mode 100644 index 0000000000..0d8d208f16 --- /dev/null +++ b/recipes/gnome/zenity_2.26.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A tool to display dialogs from the command line and shell scripts." +LICENSE = "GPL" + +DEPENDS = "gtk+ libglade glib-2.0 libnotify" + +inherit gnome + +do_configure_prepend() { + sed -i -e '/-I$(includedir)/d' src/Makefile.am +} + diff --git a/recipes/granule/libassa_3.4.2.bb b/recipes/granule/libassa_3.5.0.bb index 0598a6f5c2..af496c7e47 100644 --- a/recipes/granule/libassa_3.4.2.bb +++ b/recipes/granule/libassa_3.5.0.bb @@ -6,8 +6,7 @@ PRIORITY = "optional" LICENSE = "LGPL" PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}-2.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" inherit autotools pkgconfig diff --git a/recipes/hal/hal-info_20090414.bb b/recipes/hal/hal-info_20090414.bb new file mode 100644 index 0000000000..e6d50e3981 --- /dev/null +++ b/recipes/hal/hal-info_20090414.bb @@ -0,0 +1 @@ +require hal-info.inc diff --git a/recipes/hal/hal.inc b/recipes/hal/hal.inc index d17907ae79..da24afe25a 100644 --- a/recipes/hal/hal.inc +++ b/recipes/hal/hal.inc @@ -9,8 +9,9 @@ S = "${WORKDIR}/hal-${PV}" inherit autotools pkgconfig -DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" +DEPENDS = "virtual/kernel util-linux-ng dbus-glib udev intltool intltool-native expat libusb gperf-native" RDEPENDS += "hal-info udev-utils" +RRECOMMENDS += "eject" SRC_URI += "file://99_hal \ file://20hal \ @@ -27,6 +28,7 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --disable-policy-kit \ --disable-pmu \ --disable-pnp-ids \ + --with-udev-prefix=${sysconfdir} \ ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \ ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \ " diff --git a/recipes/hal/hal_0.5.12.bb b/recipes/hal/hal_0.5.12.bb new file mode 100644 index 0000000000..b6531e8235 --- /dev/null +++ b/recipes/hal/hal_0.5.12.bb @@ -0,0 +1,11 @@ +require hal.inc + +DEFAULT_PREFERENCE = "-1" + +# The following code finds the right linux/input.h, +# which also works with external-toolchain/SDK +do_configure() { + linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \ + grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'` + autotools_do_configure --with-linux-input-header=${linux_input_h} +} diff --git a/recipes/icu/files/rematch-gcc-bug.patch b/recipes/icu/files/rematch-gcc-bug.patch new file mode 100644 index 0000000000..4d47056ac5 --- /dev/null +++ b/recipes/icu/files/rematch-gcc-bug.patch @@ -0,0 +1,12 @@ +--- a/i18n/Makefile.in 2009-05-18 13:55:49.000000000 +0200 ++++ b/i18n/Makefile.in 2009-05-18 13:55:49.000000000 +0200 +@@ -105,6 +105,9 @@ + + all-local: $(ALL_TARGETS) + ++rematch.o: $(srcdir)/rematch.cpp ++ $(CXX) $(CPPFLAGS) $(DEFS) -c -o $@ $< ++ + install-local: install-headers install-library + + install-library: all-local diff --git a/recipes/icu/icu_3.6.bb b/recipes/icu/icu_3.6.bb index 1dbdf94b3a..3eccfb53d9 100644 --- a/recipes/icu/icu_3.6.bb +++ b/recipes/icu/icu_3.6.bb @@ -3,7 +3,8 @@ require icu-3.6.inc DEPENDS += "icu-native" PR = "r4" -SRC_URI += "file://use-g++-for-linking.patch;patch=1" +SRC_URI += "file://use-g++-for-linking.patch;patch=1 \ + file://rematch-gcc-bug.patch;patch=1" do_configure_append() { for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb new file mode 100644 index 0000000000..cdf721c26e --- /dev/null +++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "easy to embed and small HTTP server as a C library" +AUTHOR = "Christian Grothoff <christian@grothoff.org>" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake DESTDIR="${D}" install + autotools_stage_all +} diff --git a/recipes/libnss-mdns/libnss-mdns_0.10.bb b/recipes/libnss-mdns/libnss-mdns_0.10.bb new file mode 100644 index 0000000000..b325f826d6 --- /dev/null +++ b/recipes/libnss-mdns/libnss-mdns_0.10.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst_${PN} () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm_${PN} () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch b/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch index aeab62f105..ac26554845 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0001-Revert-gro-Fix-legacy-path-napi_complete-crash.patch @@ -1,7 +1,7 @@ From 26abf45ac80be4c54a63fecf1c3c1e1efb416e0a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 1 Apr 2009 18:27:09 +0300 -Subject: [PATCH] Revert "gro: Fix legacy path napi_complete crash" +Subject: [PATCH 01/69] Revert "gro: Fix legacy path napi_complete crash" This reverts commit 303c6a0251852ecbdc5c15e466dcaff5971f7517. @@ -35,5 +35,5 @@ index e3fe5c7..c1e9dc0 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch b/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch index 04ac6a9ce8..5c86e6a654 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0002-OMAPFB-move-omapfb.h-to-include-linux.patch @@ -1,7 +1,7 @@ From 02243f13eec816e11d16676a131bc04b8a0666ab Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 11 Feb 2009 16:33:02 +0200 -Subject: [PATCH] OMAPFB: move omapfb.h to include/linux/ +Subject: [PATCH 02/69] OMAPFB: move omapfb.h to include/linux/ This is needed so that omapfb.h is automatically exported to user space. @@ -1312,5 +1312,5 @@ index 0000000..b226bdf + +#endif /* __OMAPFB_H */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch b/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch index c3523362c6..4610e28704 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0003-DSS2-OMAP2-3-Display-Subsystem-driver.patch @@ -1,7 +1,7 @@ From 284deec412f9c6f15c971d8eaf4d0156a51a2f3b Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:23:42 +0300 -Subject: [PATCH] DSS2: OMAP2/3 Display Subsystem driver +Subject: [PATCH 03/69] DSS2: OMAP2/3 Display Subsystem driver Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- @@ -14446,5 +14446,5 @@ index 0000000..aceed9f + display->check_timings = venc_check_timings; +} -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch b/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch index 09afa7e5be..877bb43c56 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0004-DSS2-OMAP-framebuffer-driver.patch @@ -1,7 +1,7 @@ From db9314f01a207e256d545244d3d00dc4ce535280 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:25:48 +0300 -Subject: [PATCH] DSS2: OMAP framebuffer driver +Subject: [PATCH 04/69] DSS2: OMAP framebuffer driver Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- @@ -3399,5 +3399,5 @@ index b226bdf..96190b2 100644 extern void omapfb_register_panel(struct lcd_panel *panel); extern void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch index d12586ca2f..c68c89e171 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0005-DSS2-Add-panel-drivers.patch @@ -1,7 +1,7 @@ From 4cc0368574f587f448231ccd121266bed4bf9729 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:29:56 +0300 -Subject: [PATCH] DSS2: Add panel drivers +Subject: [PATCH 05/69] DSS2: Add panel drivers - Generic panel - Samsung LTE430WQ-F0C LCD Panel @@ -254,7 +254,7 @@ index 0000000..e4bb781 + .vfp = 4, + .vbp = 12-10, + }, -+ .recommended_bpp = 16, ++ + .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS, +}; + @@ -392,5 +392,5 @@ index 0000000..1f99150 +module_exit(sharp_ls_panel_drv_exit); +MODULE_LICENSE("GPL"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch b/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch index 0025f1aa8b..258b0b6531 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0006-DSS2-HACK-Add-DSS2-support-for-N800.patch @@ -1,7 +1,7 @@ From 18a25382e81c03230e022ca2eb7e0fce24479d6a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 10:31:57 +0300 -Subject: [PATCH] DSS2: HACK: Add DSS2 support for N800 +Subject: [PATCH 06/69] DSS2: HACK: Add DSS2 support for N800 Works, but it an ugly quick hack. @@ -1075,5 +1075,5 @@ index 0000000..91d3e37 +MODULE_DESCRIPTION("N800 LCD Driver"); +MODULE_LICENSE("GPL"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch b/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch index 4c8d432dd5..f4cd192bdd 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0008-DSS2-Add-function-to-display-object-to-get-the-back.patch @@ -1,7 +1,7 @@ From 4741076cae4f4284e1fff9a03f35475b8455af54 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 1 Apr 2009 14:36:39 +0200 -Subject: [PATCH] DSS2: Add function to display object to get the backlight level +Subject: [PATCH 08/69] DSS2: Add function to display object to get the backlight level This is needed by an upcoming patch that changes the backlight initialization to use the backlight level set by the bootloader. @@ -35,5 +35,5 @@ index 6288353..6b702c7 100644 struct device; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch b/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch index 3f55f04460..82a1474056 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0009-DSS2-Add-acx565akm-panel.patch @@ -1,7 +1,7 @@ From 66e16f86d3f4c5b34b37e965c65102b7192371de Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Thu, 2 Apr 2009 11:47:13 +0300 -Subject: [PATCH] DSS2: Add acx565akm panel +Subject: [PATCH 09/69] DSS2: Add acx565akm panel Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -774,5 +774,5 @@ index 0000000..6d3727b +#endif + -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch index c7efc58a05..f994327ec1 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0010-DSS2-Small-VRFB-context-allocation-bug-fixed.patch @@ -1,7 +1,7 @@ From 370510e24ddbf539392ebb6a1e43280965fcb19b Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Tue, 31 Mar 2009 18:47:32 +0530 -Subject: [PATCH] DSS2: Small VRFB context allocation bug fixed +Subject: [PATCH 10/69] DSS2: Small VRFB context allocation bug fixed This is minor bug while requesting and mapping memory for VRFB space. @@ -24,5 +24,5 @@ index 852abe5..44febef 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch b/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch index 1a82ed2a22..2dad1d337f 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch @@ -1,7 +1,7 @@ From 370d1f93a32e8fcaeac5c16574417e354af21d08 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath <hvaibhav@ti.com> Date: Tue, 31 Mar 2009 18:38:31 +0530 -Subject: [PATCH] DSS2: Allocated memory for Color Look-up-table +Subject: [PATCH 11/69] DSS2: Allocated memory for Color Look-up-table We were not allocating memory for CMAP buffer and due to that G_CMAP was failing, since it does check for size of CMAP buffer. @@ -33,5 +33,5 @@ index 44febef..afe40a9 100644 return r; } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch index 22add6efd2..8e1d139c72 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0012-DSS2-Fix-DMA-rotation.patch @@ -1,7 +1,7 @@ From 9c93bcab724b5935d745604773ed43825efefd87 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 13:47:11 +0300 -Subject: [PATCH] DSS2: Fix DMA rotation +Subject: [PATCH 12/69] DSS2: Fix DMA rotation u16 was not a good type for offsets. First, they need to be signed, and second, 16 bits is not enough. @@ -61,5 +61,5 @@ index ffb5648..6cea545 100644 if (plane == OMAP_DSS_GFX) { if (width != out_width || height != out_height) -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch b/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch index 76b8c73630..1abc7a8264 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch @@ -1,7 +1,7 @@ From 360a55ddd309e3a45b227a4a905ae7120dd16169 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 14:21:12 +0300 -Subject: [PATCH] DSS2: Verify that overlay paddr != 0 +Subject: [PATCH 13/69] DSS2: Verify that overlay paddr != 0 --- drivers/video/omap2/dss/dispc.c | 3 +++ @@ -37,5 +37,5 @@ index 968edbe..9209acf 100644 ovl->info = *info; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch index 3b3fd77a9a..d8aa4eb893 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch @@ -1,7 +1,7 @@ From 832b763db235da8e62f7b6ab02bcb8ad6bcb7a01 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 16:48:41 +0300 -Subject: [PATCH] DSS2: Add function to get DSS logic clock rate +Subject: [PATCH 14/69] DSS2: Add function to get DSS logic clock rate --- drivers/video/omap2/dss/dispc.c | 15 +++++++++++++++ @@ -47,5 +47,5 @@ index bac5ece..0be42b6 100644 void dispc_set_pol_freq(struct omap_panel *panel); void find_lck_pck_divs(bool is_tft, unsigned long req_pck, unsigned long fck, -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch index d6b0cbbb41..a0f2b9f528 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch @@ -1,7 +1,7 @@ From a5c235a6f0094494ae1fc1a1ba4728e0d33dfd3b Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 16:49:27 +0300 -Subject: [PATCH] DSS2: DSI: calculate VP_CLK_RATIO properly +Subject: [PATCH 15/69] DSS2: DSI: calculate VP_CLK_RATIO properly --- drivers/video/omap2/dss/dsi.c | 17 +++++++++++------ @@ -64,5 +64,5 @@ index 4442931..aecb89d 100644 r = FLD_MOD(r, 0, 8, 8); /* VP_CLK_POL */ r = FLD_MOD(r, 2, 13, 12); /* LINE_BUFFER, 2 lines */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch index bca449f169..35d65a996d 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch @@ -1,7 +1,7 @@ From 6b2c9d84c7accdfe1067fcdc8a00e50674aab4bb Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 2 Apr 2009 17:42:26 +0300 -Subject: [PATCH] DSS2: DSI: improve packet len calculation +Subject: [PATCH 16/69] DSS2: DSI: improve packet len calculation --- drivers/video/omap2/dss/dsi.c | 21 ++++++++++++++++----- @@ -54,5 +54,5 @@ index aecb89d..66ac6ea 100644 if (dsi.use_te) l = FLD_MOD(l, 1, 30, 30); /* TE_EN */ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch index 5b68b57da9..e9a5dcc67a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch @@ -1,7 +1,7 @@ From 85848d329ca3a2d6ee6841cdc11cc5951d187931 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Fri, 3 Apr 2009 19:09:20 +0200 -Subject: [PATCH] DSS2: Disable video planes on sync lost error +Subject: [PATCH 17/69] DSS2: Disable video planes on sync lost error MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -99,5 +99,5 @@ index 1bc23f7..41734f3 100644 if (errors & DISPC_IRQ_OCP_ERR) { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch index 088135c0a8..0261db2bd4 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch @@ -1,7 +1,7 @@ From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 7 Apr 2009 10:01:58 +0300 -Subject: [PATCH] DSS2: check for ovl paddr only when enabling +Subject: [PATCH 18/69] DSS2: check for ovl paddr only when enabling It seems Xvideo uses SETUP_PLANE ioctl even when the fb memory has not been allocated. Sigh. @@ -36,5 +36,5 @@ index 9209acf..c047206 100644 ovl->info = *info; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch index daa95ca50d..6569c71471 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0019-DSS2-Check-fclk-limits-when-configuring-video-plane.patch @@ -1,7 +1,7 @@ From 67f3fc050ab4e2006d5b7ec6ec341896627181ab Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:04 +0200 -Subject: [PATCH] DSS2: Check fclk limits when configuring video planes +Subject: [PATCH 19/69] DSS2: Check fclk limits when configuring video planes MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -179,5 +179,5 @@ index 41734f3..61861d8 100644 _dispc_set_vid_color_conv(plane, cconv); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch index b3248527e8..c6971ea452 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0020-DSS2-Check-scaling-limits-against-proper-values.patch @@ -1,7 +1,7 @@ From 9f8f1613253656f155b3844c8255a560f86e0acd Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:05 +0200 -Subject: [PATCH] DSS2: Check scaling limits against proper values +Subject: [PATCH 20/69] DSS2: Check scaling limits against proper values MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -75,5 +75,5 @@ index 61861d8..ae7be3d 100644 _dispc_set_color_mode(plane, color_mode); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch index 31ff180228..44f126e7a4 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0021-DSS2-Add-venc-register-dump.patch @@ -1,7 +1,7 @@ From c5e71be877e71c7df329205307e830f158c403bf Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 6 Apr 2009 17:32:06 +0200 -Subject: [PATCH] DSS2: Add venc register dump +Subject: [PATCH 21/69] DSS2: Add venc register dump MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -92,5 +92,5 @@ index aceed9f..b655df4 100644 +#undef DUMPREG +} -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch index d4fb327c76..207a85f115 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0022-DSS2-FB-remove-unused-var-warning.patch @@ -1,7 +1,7 @@ From facfd479bb6efad76eec1e74048cb7a31da7287d Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Mon, 6 Apr 2009 22:26:04 +0200 -Subject: [PATCH] DSS2: FB: remove unused var warning +Subject: [PATCH 22/69] DSS2: FB: remove unused var warning Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -23,5 +23,5 @@ index afe40a9..12ce0c3 100644 omap_vrfb_adjust_size(&w, &h, bytespp); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch index 6492905530..45045c4b4b 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0023-DSS2-pass-the-default-FB-color-format-through-board.patch @@ -1,7 +1,7 @@ From c02b843c2732bc7b15a3e35b5dd715d68225bbd1 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 8 Apr 2009 12:51:46 +0200 -Subject: [PATCH] DSS2: pass the default FB color format through board info +Subject: [PATCH 23/69] DSS2: pass the default FB color format through board info Add a field to the FB memory region platform data, so that board init code can pass a default color format to the driver. Set this @@ -210,5 +210,5 @@ index 96190b2..7a34f22 100644 unsigned map:1; /* kernel mapped by the driver */ }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch index 559e49f40a..1a68d9425a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0024-DSS2-Beagle-Use-gpio_set_value.patch @@ -1,7 +1,7 @@ From 2710416c43572652cb5355a5eaf68038c95659e8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 9 Apr 2009 12:10:46 +0300 -Subject: [PATCH] DSS2: Beagle: Use gpio_set_value +Subject: [PATCH 24/69] DSS2: Beagle: Use gpio_set_value --- arch/arm/mach-omap2/board-omap3beagle.c | 10 +++++++--- @@ -44,5 +44,5 @@ index b67e7a5..8c1961d 100644 static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch index e81b1331bb..7f889d95d8 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0025-DSS2-VRFB-Macro-for-calculating-base-address-of-th.patch @@ -1,7 +1,7 @@ From 990f3160d33361c135ee72e91f202e05a8c378fc Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Mon, 13 Apr 2009 18:50:24 +0530 -Subject: [PATCH] DSS2: VRFB: Macro for calculating base address of the VRFB context was faulty +Subject: [PATCH 25/69] DSS2: VRFB: Macro for calculating base address of the VRFB context was faulty Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -24,5 +24,5 @@ index 7e0f8fc..d68065f 100644 #define OMAP_VRFB_SIZE (2048 * 2048 * 4) -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch b/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch index 6ee3908d10..f5c249e045 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0026-DSS2-DSI-sidlemode-to-noidle-while-sending-frame.patch @@ -1,7 +1,7 @@ From a1e8018c0806a1a0579eda4b93b7d6764a2ff643 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 15 Apr 2009 14:06:54 +0300 -Subject: [PATCH] DSS2: DSI: sidlemode to noidle while sending frame +Subject: [PATCH 26/69] DSS2: DSI: sidlemode to noidle while sending frame DISPC interrupts are not wake-up capable. Smart-idle in DISPC_SIDLEMODE causes DSS interface to go to idle at the end of the frame, and the @@ -74,5 +74,5 @@ index 0be42b6..d0917a8 100644 void dispc_lcd_enable_signal(bool enable); void dispc_pck_free_enable(bool enable); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch b/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch index b56e32a11c..5265ae6b0a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0027-DSS2-VRFB-rotation-and-mirroring-implemented.patch @@ -1,7 +1,7 @@ From 77e848eeba461e9b55b09d39fd0d640caea13e19 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 9 Apr 2009 12:09:44 +0530 -Subject: [PATCH] DSS2: VRFB rotation and mirroring implemented. +Subject: [PATCH 27/69] DSS2: VRFB rotation and mirroring implemented. DSS2 modified to accept the rotation_type input to get the dma or VRFB rotation. @@ -320,5 +320,5 @@ index b0fee80..8ca0bbb 100644 ovl->info.mirror); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch b/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch index 6400da3c24..178349ed2a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0028-DSS2-OMAPFB-Added-support-for-the-YUV-VRFB-rotatio.patch @@ -1,7 +1,7 @@ From c09f1a0642fd58a1b081594ea36dfd1bf71aec52 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 9 Apr 2009 12:13:07 +0530 -Subject: [PATCH] DSS2: OMAPFB: Added support for the YUV VRFB rotation and mirroring. +Subject: [PATCH 28/69] DSS2: OMAPFB: Added support for the YUV VRFB rotation and mirroring. DSS2 now requires roatation_type to be specified by driver. Added support for that. @@ -232,5 +232,5 @@ index 2607def..43f6922 100644 bool mirror; }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch b/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch index 072978670b..e9f25dfef1 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0029-DSS2-OMAPFB-Set-line_length-correctly-for-YUV-with.patch @@ -1,7 +1,7 @@ From a8a37babe4856170f4cba86c425a8f21975d9e9e Mon Sep 17 00:00:00 2001 From: Tim Yamin <plasm@roo.me.uk> Date: Mon, 13 Apr 2009 13:57:42 -0700 -Subject: [PATCH] DSS2: OMAPFB: Set line_length correctly for YUV with VRFB. +Subject: [PATCH 29/69] DSS2: OMAPFB: Set line_length correctly for YUV with VRFB. Signed-off-by: Tim Yamin <plasm@roo.me.uk> --- @@ -57,5 +57,5 @@ index 57f5900..cd63740 100644 ovl->get_overlay_info(ovl, &info); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch b/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch index 7e2bb48938..63b3594ef5 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0030-DSS2-dispc_get_trans_key-was-returning-wrong-key-ty.patch @@ -1,7 +1,7 @@ From bda19b9359d9dc60f8b0beb5685e173e236ee30f Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Wed, 15 Apr 2009 17:05:18 +0530 -Subject: [PATCH] DSS2: dispc_get_trans_key was returning wrong key type +Subject: [PATCH 30/69] DSS2: dispc_get_trans_key was returning wrong key type Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -25,5 +25,5 @@ index 23a8155..076d3d4 100644 BUG(); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch b/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch index ae777ed04e..684857c15f 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0031-DSS2-do-bootmem-reserve-for-exclusive-access.patch @@ -1,7 +1,7 @@ From 30c40f5e6b1794430f678bf23d3319354321cab7 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Tue, 14 Apr 2009 14:50:11 +0200 -Subject: [PATCH] DSS2: do bootmem reserve for exclusive access +Subject: [PATCH 31/69] DSS2: do bootmem reserve for exclusive access BOOTMEM_DEFAULT would allow multiple reservations for the same location, we need to reserve the region for our exclusive use. Also check if the @@ -29,5 +29,5 @@ index f24a110..520f260 100644 if (size > sdram_size) { printk(KERN_ERR "Illegal SDRAM size for VRAM\n"); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch b/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch index 4959a760b1..df3a7a9dd9 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0032-DSS2-Fix-DISPC_VID_FIR-value-for-omap34xx.patch @@ -1,7 +1,7 @@ From ed7a9223f6785be03951c55f3b0695b0d5635c80 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Thu, 9 Apr 2009 15:04:44 +0200 -Subject: [PATCH] DSS2: Fix DISPC_VID_FIR value for omap34xx +Subject: [PATCH 32/69] DSS2: Fix DISPC_VID_FIR value for omap34xx MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -31,5 +31,5 @@ index 076d3d4..b8a3329 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch b/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch index f643ca64f3..6457a5b94a 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0033-DSS2-Prefer-3-tap-filter.patch @@ -1,7 +1,7 @@ From 5390230ed12585a79683733209db34e9130b8e3b Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Thu, 9 Apr 2009 15:04:43 +0200 -Subject: [PATCH] DSS2: Prefer 3-tap filter +Subject: [PATCH 33/69] DSS2: Prefer 3-tap filter MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -78,5 +78,5 @@ index b8a3329..b631dd8 100644 DSSDBG("required fclk rate = %lu Hz\n", fclk); DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate()); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch b/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch index fdfc25fb47..dd01886406 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0034-DSS2-VRAM-improve-omap_vram_add_region.patch @@ -1,7 +1,7 @@ From 946eb774e95cdc2f2fa5cdc24aa69229f82814b8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 16 Apr 2009 17:56:00 +0300 -Subject: [PATCH] DSS2: VRAM: improve omap_vram_add_region() +Subject: [PATCH 34/69] DSS2: VRAM: improve omap_vram_add_region() Combine postponed and non-posponed versions of omap_vram_add_region. Make the func non-static, so it can be called from board files. @@ -131,5 +131,5 @@ index 520f260..8e9fe77 100644 if (reserved) pr_info("Reserving %lu bytes SRAM for VRAM\n", reserved); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch b/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch index b7b395458f..6b29d50dc0 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0035-DSS2-Added-the-function-pointer-for-getting-default.patch @@ -1,7 +1,7 @@ From f825cafd5ee5c600218740507f85594c825b0c00 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 16 Apr 2009 18:47:49 +0530 -Subject: [PATCH] DSS2: Added the function pointer for getting default color. +Subject: [PATCH 35/69] DSS2: Added the function pointer for getting default color. V4L2 Framework has a CID for getting/setting default color. So added the function pointer for doing same. @@ -62,5 +62,5 @@ index 8ca0bbb..12cf7b0 100644 dss_overlay_setup_dispc_manager(mgr); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch b/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch index c6e9f16b3a..ace5079234 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0036-DSS2-Added-support-for-setting-and-querying-alpha-b.patch @@ -1,7 +1,7 @@ From 6c56dc10226c84f41917ac2117b0e654fa080d40 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Thu, 16 Apr 2009 19:00:11 +0530 -Subject: [PATCH] DSS2: Added support for setting and querying alpha blending. +Subject: [PATCH 36/69] DSS2: Added support for setting and querying alpha blending. Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -114,5 +114,5 @@ index 12cf7b0..90acd28 100644 mgr->caps = OMAP_DSS_OVL_MGR_CAP_DISPC, -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch b/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch index fc62b09512..e7f43ad83d 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0037-DSS2-Added-support-for-querying-color-keying.patch @@ -1,7 +1,7 @@ From 2c9edd6af31a812a9487dd8bc12322e105a29f44 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 09:42:36 +0530 -Subject: [PATCH] DSS2: Added support for querying color keying. +Subject: [PATCH 37/69] DSS2: Added support for querying color keying. V4L2 Framework has a ioctl for getting/setting color keying. So added the function manager pointers for doing same. @@ -146,5 +146,5 @@ index 90acd28..e0501c4 100644 &omap_dss_mgr_enable_alpha_blending; mgr->get_alpha_blending_status = -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch b/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch index 65cb113574..096c976a70 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0038-DSS2-OMAPFB-Some-color-keying-pointerd-renamed-in-D.patch @@ -1,7 +1,7 @@ From 9e8877f0e5b17d3ddd101d6a63aa86fdb14d35d5 Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 09:51:25 +0530 -Subject: [PATCH] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB +Subject: [PATCH 38/69] DSS2:OMAPFB: Some color keying pointerd renamed in DSS2. Replicated in FB Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -52,5 +52,5 @@ index 7f18d2a..79d8916 100644 r = -ENODEV; goto err; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch b/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch index af8c2cd09b..d731b78008 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0039-DSS2-Add-sysfs-entry-to-for-the-alpha-blending-supp.patch @@ -1,7 +1,7 @@ From 6f1f0c7b19ecb468824b79f9d181ef0da41b7d7d Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 13:58:21 +0530 -Subject: [PATCH] DSS2: Add sysfs entry to for the alpha blending support. +Subject: [PATCH 39/69] DSS2: Add sysfs entry to for the alpha blending support. Signed-off-by: Hardik Shah <hardik.shah@ti.com> --- @@ -55,5 +55,5 @@ index e0501c4..7965a84 100644 }; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch b/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch index 66be75f3f7..471a2a7f6c 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0040-DSS2-Provided-proper-exclusion-for-destination-colo.patch @@ -1,7 +1,7 @@ From a5129f272a48aa22629137c9c31e60eddb8c3f5d Mon Sep 17 00:00:00 2001 From: Hardik Shah <hardik.shah@ti.com> Date: Fri, 17 Apr 2009 14:24:46 +0530 -Subject: [PATCH] DSS2: Provided proper exclusion for destination color keying and alpha blending. +Subject: [PATCH 40/69] DSS2: Provided proper exclusion for destination color keying and alpha blending. OMAP does not support destination color key and alpha blending simultaneously. So this patch does not allow the user @@ -93,5 +93,5 @@ index 7965a84..108489c 100644 return size; } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch b/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch index 6785ade279..2c90c0cc06 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0041-DSS2-Disable-vertical-offset-with-fieldmode.patch @@ -1,7 +1,7 @@ From 9bcac9b9e678f476c83b5679b1215b6bc946130a Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:18 +0200 -Subject: [PATCH] DSS2: Disable vertical offset with fieldmode +Subject: [PATCH 41/69] DSS2: Disable vertical offset with fieldmode MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -67,5 +67,5 @@ index 7e551c2..f15614b 100644 _dispc_set_vid_color_conv(plane, cconv); } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch b/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch index 5264911b41..7e2e44d809 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0042-DSS2-Don-t-enable-fieldmode-automatically.patch @@ -1,7 +1,7 @@ From 9c6de0fed6e8a598d026d348533fdf731b737d55 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:19 +0200 -Subject: [PATCH] DSS2: Don't enable fieldmode automatically +Subject: [PATCH 42/69] DSS2: Don't enable fieldmode automatically MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -30,5 +30,5 @@ index f15614b..1c036c1 100644 if (ilace) { -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch b/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch index 76e37817c4..2e09335611 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0043-DSS2-Swap-field-0-and-field-1-registers.patch @@ -1,7 +1,7 @@ From 35e88797e93b107ba602dee1e2ac8ea761dccd4b Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> Date: Mon, 20 Apr 2009 16:26:20 +0200 -Subject: [PATCH] DSS2: Swap field 0 and field 1 registers +Subject: [PATCH 43/69] DSS2: Swap field 0 and field 1 registers MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit @@ -166,5 +166,5 @@ index 1c036c1..9bab6cf 100644 (fieldmode ? 1 : 0), ps); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch b/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch index 32def9e8d5..19d24c3a07 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0044-DSS2-add-sysfs-entry-for-seting-the-rotate-type.patch @@ -1,7 +1,7 @@ From a9b3500bd14609750a2337e866e1df62627c1bac Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Mon, 20 Apr 2009 14:55:33 +0200 -Subject: [PATCH] DSS2: add sysfs entry for seting the rotate type +Subject: [PATCH 44/69] DSS2: add sysfs entry for seting the rotate type This can help in utilizing VRAM memory better. Since with VRFB rotation we waste a lot of physical memory due to the VRFB HW design, provide the @@ -72,5 +72,5 @@ index 2c88718..4e3da42 100644 __ATTR(size, S_IRUGO | S_IWUSR, show_size, store_size), __ATTR(overlays, S_IRUGO | S_IWUSR, show_overlays, store_overlays), -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch b/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch index 9382469850..3206306cc7 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0045-DSS2-Fixed-line-endings-from-to.patch @@ -1,7 +1,7 @@ From b0e081456a9b094109c04467d041ff693843ca47 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 21 Apr 2009 09:25:16 +0300 -Subject: [PATCH] DSS2: Fixed line endings from , to ; +Subject: [PATCH 45/69] DSS2: Fixed line endings from , to ; --- drivers/video/omap2/dss/manager.c | 18 +++++++++--------- @@ -44,5 +44,5 @@ index 108489c..bf059e0 100644 dss_overlay_setup_dispc_manager(mgr); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch b/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch index 4ae5fbdd9a..301db79267 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0046-DSS2-DSI-decrease-sync-timeout-from-60s-to-2s.patch @@ -1,7 +1,7 @@ From 0f88992b2681aed4f31dc7dd3926b357bbc95154 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Tue, 21 Apr 2009 10:11:55 +0300 -Subject: [PATCH] DSS2: DSI: decrease sync timeout from 60s to 2s +Subject: [PATCH 46/69] DSS2: DSI: decrease sync timeout from 60s to 2s The framedone-problem should be ok now, so we shouldn't get long waits. --- @@ -22,5 +22,5 @@ index 50af925..d59ad38 100644 DSSDBGF(""); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch b/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch index 0b0f104b30..fbc30b8858 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0047-DSS2-fix-return-value-for-rotate_type-sysfs-functio.patch @@ -1,7 +1,7 @@ From 7ddd5eaa7bc345c3719d613a46a95b7e8052ad2c Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Tue, 21 Apr 2009 15:18:36 +0200 -Subject: [PATCH] DSS2: fix return value for rotate_type sysfs function +Subject: [PATCH 47/69] DSS2: fix return value for rotate_type sysfs function Signed-off-by: Imre Deak <imre.deak@nokia.com> --- @@ -40,5 +40,5 @@ index 4e3da42..13028ae 100644 -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch b/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch index cc6663fa21..1097fedabf 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0048-OMAP2-3-DMA-implement-trans-copy-and-const-fill.patch @@ -1,7 +1,7 @@ From e34564db95627ad20e918b240c45e2bd5555f7e8 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:06:08 +0300 -Subject: [PATCH] OMAP2/3: DMA: implement trans copy and const fill +Subject: [PATCH 48/69] OMAP2/3: DMA: implement trans copy and const fill Implement transparent copy and constant fill features for OMAP2/3. @@ -119,5 +119,5 @@ index 224b077..4e34f47 100644 /*----------------------------------------------------------------------------*/ -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch b/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch index e9fc76ce15..d9901f95d9 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0049-DSS2-VRAM-clear-allocated-area-with-DMA.patch @@ -1,7 +1,7 @@ From 02034cc79f69512a6037f03ad1243c28f59fdd8a Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:25:20 +0300 -Subject: [PATCH] DSS2: VRAM: clear allocated area with DMA +Subject: [PATCH 49/69] DSS2: VRAM: clear allocated area with DMA Use DMA constant fill feature to clear VRAM area when someone allocates it. @@ -97,5 +97,5 @@ index 8e9fe77..90276ac 100644 } -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch b/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch index 8c5edd0c3d..4a0a078bc7 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0050-DSS2-OMAPFB-remove-fb-clearing-code.patch @@ -1,7 +1,7 @@ From 07482193cccdfe9ede1f47d72790dfbe54343505 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 10:26:06 +0300 -Subject: [PATCH] DSS2: OMAPFB: remove fb clearing code +Subject: [PATCH 50/69] DSS2: OMAPFB: remove fb clearing code VRAM manager does the clearing now when the area is allocated. --- @@ -49,5 +49,5 @@ index cd63740..76e7c6c 100644 rg->paddr = paddr; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch b/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch index 93ff3205d3..739d3cd1a6 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch @@ -1,7 +1,7 @@ From b47aef28536f3c276d232c41cd3084c69389dca4 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Wed, 22 Apr 2009 14:11:52 +0300 -Subject: [PATCH] DSS2: VRAM: use debugfs, not procfs +Subject: [PATCH 51/69] DSS2: VRAM: use debugfs, not procfs --- arch/arm/plat-omap/vram.c | 103 +++++++++++++++------------------------------ @@ -166,5 +166,5 @@ index 90276ac..e847579 100644 return 0; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch b/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch index b8f89b6239..a28a96b23b 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch @@ -1,7 +1,7 @@ From 635fa66abe6e502c9b78b1dc66757bf67fd163e1 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@nokia.com> Date: Wed, 22 Apr 2009 14:40:48 +0200 -Subject: [PATCH] DSS2: VRAM: fix section mismatch warning +Subject: [PATCH 52/69] DSS2: VRAM: fix section mismatch warning postponed_regions are accessed from the non __init omap_vram_add_region(). @@ -30,5 +30,5 @@ index e847579..b126a64 100644 struct vram_alloc { struct list_head list; -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch b/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch index f591fb700a..38d162d024 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch @@ -1,7 +1,7 @@ From c7ce3c5e9f7e28900b8ea9c3e1afe41dcdc0863d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@nokia.com> Date: Thu, 23 Apr 2009 10:46:53 +0300 -Subject: [PATCH] DSS2: disable LCD & DIGIT before resetting DSS +Subject: [PATCH 53/69] DSS2: disable LCD & DIGIT before resetting DSS This seems to fix the synclost problem that we get, if the bootloader starts the DSS and the kernel resets it. @@ -37,5 +37,5 @@ index adc1f34..aab9758 100644 /* autoidle */ REG_FLD_MOD(DSS_SYSCONFIG, 1, 0, 0); -- -1.5.6.5 +1.6.2.4 diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch new file mode 100644 index 0000000000..5f4f155452 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0054-DSS2-DSI-more-error-handling.patch @@ -0,0 +1,85 @@ +From 3b27a3c4f6b84e46c84509f610dfe1456c0d72d3 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Mon, 27 Apr 2009 11:06:16 +0300 +Subject: [PATCH 54/69] DSS2: DSI: more error handling + +--- + drivers/video/omap2/dss/dsi.c | 27 +++++++++++++++++++++++++++ + 1 files changed, 27 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index d59ad38..d8df353 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -289,6 +289,8 @@ static struct + + bool autoupdate_setup; + ++ u32 errors; ++ spinlock_t errors_lock; + #ifdef DEBUG + ktime_t perf_setup_time; + ktime_t perf_start_time; +@@ -541,6 +543,9 @@ void dsi_irq_handler(void) + if (irqstatus & DSI_IRQ_ERROR_MASK) { + DSSERR("DSI error, irqstatus %x\n", irqstatus); + print_irq_status(irqstatus); ++ spin_lock(&dsi.errors_lock); ++ dsi.errors |= irqstatus & DSI_IRQ_ERROR_MASK; ++ spin_unlock(&dsi.errors_lock); + } else if (debug_irq) { + print_irq_status(irqstatus); + } +@@ -616,6 +621,17 @@ static void _dsi_initialize_irq(void) + -1 & (~DSI_CIO_IRQ_ERRCONTROL2)); + } + ++static u32 dsi_get_errors(void) ++{ ++ unsigned long flags; ++ u32 e; ++ spin_lock_irqsave(&dsi.errors_lock, flags); ++ e = dsi.errors; ++ dsi.errors = 0; ++ spin_unlock_irqrestore(&dsi.errors_lock, flags); ++ return e; ++} ++ + static void dsi_vc_enable_bta_irq(int channel) + { + u32 l; +@@ -1807,6 +1823,7 @@ static int dsi_vc_send_bta(int channel) + static int dsi_vc_send_bta_sync(int channel) + { + int r = 0; ++ u32 err; + + init_completion(&dsi.bta_completion); + +@@ -1822,6 +1839,13 @@ static int dsi_vc_send_bta_sync(int channel) + r = -EIO; + goto err; + } ++ ++ err = dsi_get_errors(); ++ if (err) { ++ DSSERR("Error while sending BTA: %x\n", err); ++ r = -EIO; ++ goto err; ++ } + err: + dsi_vc_disable_bta_irq(channel); + +@@ -3720,6 +3744,9 @@ int dsi_init(void) + { + u32 rev; + ++ spin_lock_init(&dsi.errors_lock); ++ dsi.errors = 0; ++ + spin_lock_init(&dsi.cmd_lock); + dsi.cmd_fifo = kfifo_alloc( + DSI_CMD_FIFO_LEN * sizeof(struct dsi_cmd_item), +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch b/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch new file mode 100644 index 0000000000..c545b648cc --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0055-DSS2-Added-global-alpha-support.patch @@ -0,0 +1,230 @@ +From c8588370442424ac31e2392b07891615629eb999 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Fri, 24 Apr 2009 15:29:06 +0530 +Subject: [PATCH 55/69] DSS2: Added global alpha support. + +global_alpha sysfs entry for video1 plane will always show 255 as +it does not support global_alpha. +Initliazied the global alpha field for all the overlays +to 255 (fully opaque). +Documentation also updated. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + Documentation/arm/OMAP/DSS | 1 + + arch/arm/plat-omap/include/mach/display.h | 1 + + drivers/video/omap2/dss/dispc.c | 25 ++++++++++++++++--- + drivers/video/omap2/dss/dss.h | 3 +- + drivers/video/omap2/dss/manager.c | 3 +- + drivers/video/omap2/dss/overlay.c | 37 +++++++++++++++++++++++++++++ + 6 files changed, 64 insertions(+), 6 deletions(-) + +diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS +index 9e902a2..249e1a3 100644 +--- a/Documentation/arm/OMAP/DSS ++++ b/Documentation/arm/OMAP/DSS +@@ -133,6 +133,7 @@ name + output_size width,height + position x,y + screen_width width ++global_alpha global alpha 0-255 0=transparent 255=opaque + + /sys/devices/platform/omapdss/manager? directory: + display Destination display +diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h +index d0b4c83..45b16ca 100644 +--- a/arch/arm/plat-omap/include/mach/display.h ++++ b/arch/arm/plat-omap/include/mach/display.h +@@ -363,6 +363,7 @@ struct omap_overlay_info { + u16 pos_y; + u16 out_width; /* if 0, out_width == width */ + u16 out_height; /* if 0, out_height == height */ ++ u8 global_alpha; + }; + + enum omap_overlay_caps { +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 9bab6cf..b6a39f5 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -778,6 +778,17 @@ static void _dispc_set_vid_size(enum omap_plane plane, int width, int height) + dispc_write_reg(vsi_reg[plane-1], val); + } + ++static void _dispc_setup_global_alpha(enum omap_plane plane, u8 global_alpha) ++{ ++ ++ BUG_ON(plane == OMAP_DSS_VIDEO1); ++ ++ if (plane == OMAP_DSS_GFX) ++ REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 7, 0); ++ else if (plane == OMAP_DSS_VIDEO2) ++ REG_FLD_MOD(DISPC_GLOBAL_ALPHA, global_alpha, 23, 16); ++} ++ + static void _dispc_set_pix_inc(enum omap_plane plane, s32 inc) + { + const struct dispc_reg ri_reg[] = { DISPC_GFX_PIXEL_INC, +@@ -1444,7 +1455,8 @@ static int _dispc_setup_plane(enum omap_plane plane, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, int mirror) ++ u8 rotation, int mirror, ++ u8 global_alpha) + { + const int maxdownscale = cpu_is_omap34xx() ? 4 : 2; + bool five_taps = 0; +@@ -1592,6 +1604,9 @@ static int _dispc_setup_plane(enum omap_plane plane, + + _dispc_set_rotation_attrs(plane, rotation, mirror, color_mode); + ++ if (plane != OMAP_DSS_VIDEO1) ++ _dispc_setup_global_alpha(plane, global_alpha); ++ + return 0; + } + +@@ -3011,7 +3026,7 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, bool mirror) ++ u8 rotation, bool mirror, u8 global_alpha) + { + int r = 0; + +@@ -3032,7 +3047,8 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + out_width, out_height, + color_mode, ilace, + rotation_type, +- rotation, mirror); ++ rotation, mirror, ++ global_alpha); + + enable_clocks(0); + +@@ -3247,7 +3263,8 @@ void dispc_setup_partial_planes(struct omap_display *display, + pi->color_mode, 0, + pi->rotation_type, + pi->rotation, +- pi->mirror); ++ pi->mirror, ++ pi->global_alpha); + + dispc_enable_plane(ovl->id, 1); + } +diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h +index 1d01ff6..20cef0a 100644 +--- a/drivers/video/omap2/dss/dss.h ++++ b/drivers/video/omap2/dss/dss.h +@@ -273,7 +273,8 @@ int dispc_setup_plane(enum omap_plane plane, enum omap_channel channel_out, + enum omap_color_mode color_mode, + bool ilace, + enum omap_dss_rotation_type rotation_type, +- u8 rotation, bool mirror); ++ u8 rotation, bool mirror, ++ u8 global_alpha); + + void dispc_go(enum omap_channel channel); + void dispc_enable_lcd_out(bool enable); +diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c +index bf059e0..1e6cd8d 100644 +--- a/drivers/video/omap2/dss/manager.c ++++ b/drivers/video/omap2/dss/manager.c +@@ -464,7 +464,8 @@ static int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) + ilace, + ovl->info.rotation_type, + ovl->info.rotation, +- ovl->info.mirror); ++ ovl->info.mirror, ++ ovl->info.global_alpha); + + if (r) { + DSSERR("dispc_setup_plane failed for ovl %d\n", +diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c +index c047206..035a57a 100644 +--- a/drivers/video/omap2/dss/overlay.c ++++ b/drivers/video/omap2/dss/overlay.c +@@ -194,6 +194,37 @@ static ssize_t overlay_enabled_store(struct omap_overlay *ovl, const char *buf, + return size; + } + ++static ssize_t overlay_global_alpha_show(struct omap_overlay *ovl, char *buf) ++{ ++ return snprintf(buf, PAGE_SIZE, "%d\n", ++ ovl->info.global_alpha); ++} ++ ++static ssize_t overlay_global_alpha_store(struct omap_overlay *ovl, ++ const char *buf, size_t size) ++{ ++ int r; ++ struct omap_overlay_info info; ++ ++ ovl->get_overlay_info(ovl, &info); ++ ++ /* Video1 plane does not support global alpha ++ * to always make it 255 completely opaque ++ */ ++ if (ovl->id == OMAP_DSS_VIDEO1) ++ info.global_alpha = 255; ++ else ++ info.global_alpha = simple_strtoul(buf, NULL, 10); ++ ++ if ((r = ovl->set_overlay_info(ovl, &info))) ++ return r; ++ ++ if (ovl->manager && (r = ovl->manager->apply(ovl->manager))) ++ return r; ++ ++ return size; ++} ++ + struct overlay_attribute { + struct attribute attr; + ssize_t (*show)(struct omap_overlay *, char *); +@@ -215,6 +246,8 @@ static OVERLAY_ATTR(output_size, S_IRUGO|S_IWUSR, + overlay_output_size_show, overlay_output_size_store); + static OVERLAY_ATTR(enabled, S_IRUGO|S_IWUSR, + overlay_enabled_show, overlay_enabled_store); ++static OVERLAY_ATTR(global_alpha, S_IRUGO|S_IWUSR, ++ overlay_global_alpha_show, overlay_global_alpha_store); + + static struct attribute *overlay_sysfs_attrs[] = { + &overlay_attr_name.attr, +@@ -224,6 +257,7 @@ static struct attribute *overlay_sysfs_attrs[] = { + &overlay_attr_position.attr, + &overlay_attr_output_size.attr, + &overlay_attr_enabled.attr, ++ &overlay_attr_global_alpha.attr, + NULL + }; + +@@ -444,6 +478,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->id = OMAP_DSS_GFX; + ovl->supported_modes = OMAP_DSS_COLOR_GFX_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + case 1: + ovl->name = "vid1"; +@@ -451,6 +486,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_SCALE | + OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + case 2: + ovl->name = "vid2"; +@@ -458,6 +494,7 @@ void dss_init_overlays(struct platform_device *pdev, const char *def_disp_name) + ovl->supported_modes = OMAP_DSS_COLOR_VID_OMAP3; + ovl->caps = OMAP_DSS_OVL_CAP_SCALE | + OMAP_DSS_OVL_CAP_DISPC; ++ ovl->info.global_alpha = 255; + break; + } + +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch new file mode 100644 index 0000000000..c46fda0d52 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch @@ -0,0 +1,35 @@ +From 32cf39c92dfd28e18936c31eea90b4d43a3c0968 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Fri, 24 Apr 2009 14:33:48 +0530 +Subject: [PATCH 56/69] DSS2: Rotation attrs for YUV need not to be reversed for 90 and 270 + +DSS2 supports horizontal mirroing. so only 180 and 0 degree attributes needs +to be reversed for mirroring. +Slight corrupt image is seen with 90 ad 270 degree rotation with mirroring +when the image height and widht is not 32-pixels aligned. To be specific +resolution is 168X192. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + drivers/video/omap2/dss/dispc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index b6a39f5..f79decb 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1110,9 +1110,9 @@ static void _dispc_set_rotation_attrs(enum omap_plane plane, u8 rotation, + if (mirroring) { + switch (rotation) { + case 0: vidrot = 2; break; +- case 1: vidrot = 3; break; ++ case 1: vidrot = 1; break; + case 2: vidrot = 0; break; +- case 3: vidrot = 1; break; ++ case 3: vidrot = 3; break; + } + } else { + switch (rotation) { +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch b/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch new file mode 100644 index 0000000000..929f41b590 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch @@ -0,0 +1,32 @@ +From bc67f1fce4472087014fdacd3f44ea732200533e Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Mon, 27 Apr 2009 13:15:07 +0530 +Subject: [PATCH 57/69] DSS2: Documentation update for new sysfs entries in omapdss/manager + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + Documentation/arm/OMAP/DSS | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/Documentation/arm/OMAP/DSS b/Documentation/arm/OMAP/DSS +index 249e1a3..751000b 100644 +--- a/Documentation/arm/OMAP/DSS ++++ b/Documentation/arm/OMAP/DSS +@@ -136,8 +136,13 @@ screen_width width + global_alpha global alpha 0-255 0=transparent 255=opaque + + /sys/devices/platform/omapdss/manager? directory: +-display Destination display ++display Destination display + name ++alpha_blending_enabled 0=off 1=on ++color_key_enabled 0=off 1=on ++color_key_type gfx-destination video-source ++color_key_value 0 to 2^24 ++default_color default background color RGB24 0 to 2^24 + + /sys/devices/platform/omapdss/display? directory: + ctrl_name Controller name +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch b/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch new file mode 100644 index 0000000000..7a6f23b349 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch @@ -0,0 +1,56 @@ +From 9500c899f05048d17ced4340ecfd377656a23934 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Fri, 17 Apr 2009 18:34:33 +0200 +Subject: [PATCH 58/69] DSS2: Don't touch plane coordinates when changing fb->ovl mapping +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When attaching overlays to a framebuffer via the 'overlays' sysfs file +do not touch the planes' coordinates. Without this change attaching +VID2 to a framebuffer which already has VID1 attached would cause VID1 +to be reset to position 0,0 and scaled to 1:1 size. Also call +omapfb_apply_changes() only once after all the overlays have been +attached to avoid fiddling with all the overlays several times. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 13 ++++++------- + 1 files changed, 6 insertions(+), 7 deletions(-) + +diff --git a/drivers/video/omap2/omapfb/omapfb-sysfs.c b/drivers/video/omap2/omapfb/omapfb-sysfs.c +index 13028ae..702199d 100644 +--- a/drivers/video/omap2/omapfb/omapfb-sysfs.c ++++ b/drivers/video/omap2/omapfb/omapfb-sysfs.c +@@ -183,6 +183,7 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr, + struct omap_overlay *ovl; + int num_ovls, r, i; + int len; ++ bool added = false; + + num_ovls = 0; + +@@ -284,15 +285,13 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr, + + ofbi->overlays[ofbi->num_overlays++] = ovl; + +- r = omapfb_apply_changes(fbi, 1); ++ added = true; ++ } ++ ++ if (added) { ++ r = omapfb_apply_changes(fbi, 0); + if (r) + goto out; +- +- if (ovl->manager) { +- r = ovl->manager->apply(ovl->manager); +- if (r) +- goto out; +- } + } + + r = count; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch b/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch new file mode 100644 index 0000000000..9ca0f2eab1 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch @@ -0,0 +1,97 @@ +From 750f7ddc0881834f3400c40e9a59d11f9427cf99 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Wed, 29 Apr 2009 17:26:30 +0300 +Subject: [PATCH 59/69] DSS2: DSI: configure ENTER/EXIT_HS_MODE_LATENCY + +--- + drivers/video/omap2/dss/dsi.c | 49 ++++++++++++++++++++++++++++++++-------- + 1 files changed, 39 insertions(+), 10 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index d8df353..5225ed6 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -2309,15 +2309,26 @@ static int dsi_proto_config(struct omap_display *display) + return 0; + } + +-static void dsi_proto_timings(void) +-{ +- int tlpx_half, tclk_zero, tclk_prepare, tclk_trail; +- int tclk_pre, tclk_post; +- int ddr_clk_pre, ddr_clk_post; ++static void dsi_proto_timings(struct omap_display *display) ++{ ++ unsigned tlpx, tclk_zero, tclk_prepare, tclk_trail; ++ unsigned tclk_pre, tclk_post; ++ unsigned ths_prepare, ths_prepare_ths_zero, ths_zero; ++ unsigned ths_trail, ths_exit; ++ unsigned ddr_clk_pre, ddr_clk_post; ++ unsigned enter_hs_mode_lat, exit_hs_mode_lat; ++ unsigned ths_eot; + u32 r; + ++ r = dsi_read_reg(DSI_DSIPHY_CFG0); ++ ths_prepare = FLD_GET(r, 31, 24); ++ ths_prepare_ths_zero = FLD_GET(r, 23, 16); ++ ths_zero = ths_prepare_ths_zero - ths_prepare; ++ ths_trail = FLD_GET(r, 15, 8); ++ ths_exit = FLD_GET(r, 7, 0); ++ + r = dsi_read_reg(DSI_DSIPHY_CFG1); +- tlpx_half = FLD_GET(r, 22, 16); ++ tlpx = FLD_GET(r, 22, 16) * 2; + tclk_trail = FLD_GET(r, 15, 8); + tclk_zero = FLD_GET(r, 7, 0); + +@@ -2329,17 +2340,35 @@ static void dsi_proto_timings(void) + /* min 60ns + 52*UI */ + tclk_post = ns2ddr(60) + 26; + +- ddr_clk_pre = (tclk_pre + tlpx_half*2 + tclk_zero + tclk_prepare) / 4; +- ddr_clk_post = (tclk_post + tclk_trail) / 4; ++ ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare, ++ 4); ++ ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4); + + r = dsi_read_reg(DSI_CLK_TIMING); + r = FLD_MOD(r, ddr_clk_pre, 15, 8); + r = FLD_MOD(r, ddr_clk_post, 7, 0); + dsi_write_reg(DSI_CLK_TIMING, r); + +- DSSDBG("ddr_clk_pre %d, ddr_clk_post %d\n", ++ DSSDBG("ddr_clk_pre %u, ddr_clk_post %u\n", + ddr_clk_pre, + ddr_clk_post); ++ ++ /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ ++ if (display->hw_config.u.dsi.data1_lane != 0 && ++ display->hw_config.u.dsi.data2_lane != 0) ++ ths_eot = 2; ++ else ++ ths_eot = 4; ++ ++ enter_hs_mode_lat = DIV_ROUND_UP(tlpx + ths_prepare + ths_zero, 4) + 4; ++ exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot; ++ ++ r = FLD_VAL(enter_hs_mode_lat, 31, 16) | ++ FLD_VAL(exit_hs_mode_lat, 15, 0); ++ dsi_write_reg(DSI_VM_TIMING7, r); ++ ++ DSSDBG("enter_hs_mode_lat %u, exit_hs_mode_lat %u\n", ++ enter_hs_mode_lat, exit_hs_mode_lat); + } + + +@@ -3340,7 +3369,7 @@ static int dsi_display_init_dsi(struct omap_display *display) + + _dsi_print_reset_status(); + +- dsi_proto_timings(); ++ dsi_proto_timings(display); + dsi_set_lp_clk_divisor(); + + if (1) +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch b/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch new file mode 100644 index 0000000000..0ff2c7b1a6 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch @@ -0,0 +1,34 @@ +From 233a6e4f4ccaf5827f04ab38c590397755e61ecb Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Mon, 4 May 2009 16:18:30 +0200 +Subject: [PATCH 60/69] DSS2: Avoid div by zero when calculating required fclk +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When calculating the required fclk rate for five tap filtering if the +display width and output width are equal div by zero could occur. The +TRM doesn't actually specify how this case should be handled but for +now just skip the calculation which would trigger the div by zero. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index f79decb..5fc9457 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1399,7 +1399,7 @@ static unsigned long calc_fclk_five_taps(u16 width, u16 height, + do_div(tmp, 2 * out_height * ppl); + fclk = tmp; + +- if (height > 2 * out_height) { ++ if (height > 2 * out_height && ppl != out_width) { + tmp = pclk * (height - 2 * out_height) * out_width; + do_div(tmp, 2 * out_height * (ppl - out_width)); + fclk = max(fclk, (u32) tmp); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch b/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch new file mode 100644 index 0000000000..a0b694736b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0061-DSS2-VRFB-save-restore-context.patch @@ -0,0 +1,106 @@ +From e58576ceca922bfe4c793e6f77a873c4ea14f768 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 09:05:12 +0300 +Subject: [PATCH 61/69] DSS2: VRFB: save / restore context + +The VRFB is part of the SMS and supplied by the core power domain; do +the context saving while VRFB is configured and restore it along with +the rest of the domain context. + +This patch only implements the restore functionality, but not the +actual call to the restore. That belongs to PM functionality. +--- + arch/arm/plat-omap/include/mach/vrfb.h | 1 + + arch/arm/plat-omap/vrfb.c | 50 ++++++++++++++++++++++++++----- + 2 files changed, 43 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/vrfb.h b/arch/arm/plat-omap/include/mach/vrfb.h +index 12c7fab..ee6c062 100644 +--- a/arch/arm/plat-omap/include/mach/vrfb.h ++++ b/arch/arm/plat-omap/include/mach/vrfb.h +@@ -44,5 +44,6 @@ extern void omap_vrfb_adjust_size(u16 *width, u16 *height, + extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u16 width, u16 height, + enum omap_color_mode color_mode); ++extern void omap_vrfb_restore_context(void); + + #endif /* __VRFB_H */ +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 2ae0d68..649803e 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -39,6 +39,33 @@ + /* bitmap of reserved contexts */ + static unsigned ctx_map; + ++/* ++ * Access to this happens from client drivers or the PM core after wake-up. ++ * For the first case we require locking at the driver level, for the second ++ * we don't need locking, since no drivers will run until after the wake-up ++ * has finished. ++ */ ++struct { ++ u32 physical_ba; ++ u32 control; ++ u32 size; ++} vrfb_hw_context[VRFB_NUM_CTXS]; ++ ++void omap_vrfb_restore_context(void) ++{ ++ int i; ++ ++ for (i = 0; i < VRFB_NUM_CTXS; i++) { ++ /* Restore only the active contexts */ ++ if (!(ctx_map & (1 << i))) ++ continue; ++ omap_writel(vrfb_hw_context[i].control, SMS_ROT_CONTROL(i)); ++ omap_writel(vrfb_hw_context[i].size, SMS_ROT_SIZE(i)); ++ omap_writel(vrfb_hw_context[i].physical_ba, ++ SMS_ROT_PHYSICAL_BA(i)); ++ } ++} ++ + void omap_vrfb_adjust_size(u16 *width, u16 *height, + u8 bytespp) + { +@@ -56,6 +83,8 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u16 vrfb_height; + u8 ctx = vrfb->context; + u8 bytespp; ++ u32 size; ++ u32 control; + + DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d)\n", ctx, paddr, + width, height, bytespp); +@@ -100,15 +129,20 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + + DBG("vrfb w %u, h %u\n", vrfb_width, vrfb_height); + ++ size = vrfb_width << SMS_IMAGEWIDTH_OFFSET; ++ size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET; ++ ++ control = pixel_size_exp << SMS_PS_OFFSET; ++ control |= VRFB_PAGE_WIDTH_EXP << SMS_PW_OFFSET; ++ control |= VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET; ++ ++ vrfb_hw_context[ctx].physical_ba = paddr; ++ vrfb_hw_context[ctx].size = size; ++ vrfb_hw_context[ctx].control = control; ++ + omap_writel(paddr, SMS_ROT_PHYSICAL_BA(ctx)); +- omap_writel((vrfb_width << SMS_IMAGEWIDTH_OFFSET) | +- (vrfb_height << SMS_IMAGEHEIGHT_OFFSET), +- SMS_ROT_SIZE(ctx)); +- +- omap_writel(pixel_size_exp << SMS_PS_OFFSET | +- VRFB_PAGE_WIDTH_EXP << SMS_PW_OFFSET | +- VRFB_PAGE_HEIGHT_EXP << SMS_PH_OFFSET, +- SMS_ROT_CONTROL(ctx)); ++ omap_writel(size, SMS_ROT_SIZE(ctx)); ++ omap_writel(control, SMS_ROT_CONTROL(ctx)); + + DBG("vrfb offset pixels %d, %d\n", + vrfb_width - width, vrfb_height - height); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch new file mode 100644 index 0000000000..8d5f57866d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0062-DSS2-VRAM-Fix-indentation.patch @@ -0,0 +1,65 @@ +From 0fb6754f996b5022e1d856fda3d3258382383596 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Wed, 6 May 2009 09:03:43 +0300 +Subject: [PATCH 62/69] DSS2: VRAM: Fix indentation + +--- + arch/arm/plat-omap/vram.c | 26 +++++++++++++------------- + 1 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/arch/arm/plat-omap/vram.c b/arch/arm/plat-omap/vram.c +index b126a64..f3ce849 100644 +--- a/arch/arm/plat-omap/vram.c ++++ b/arch/arm/plat-omap/vram.c +@@ -287,35 +287,35 @@ static void _omap_vram_dma_cb(int lch, u16 ch_status, void *data) + static int _omap_vram_clear(u32 paddr, unsigned pages) + { + struct completion compl; +- unsigned elem_count; +- unsigned frame_count; ++ unsigned elem_count; ++ unsigned frame_count; + int r; + int lch; + + init_completion(&compl); + +- r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA", ++ r = omap_request_dma(OMAP_DMA_NO_DEVICE, "VRAM DMA", + _omap_vram_dma_cb, +- &compl, &lch); +- if (r) { ++ &compl, &lch); ++ if (r) { + pr_err("VRAM: request_dma failed for memory clear\n"); + return -EBUSY; + } + +- elem_count = pages * PAGE_SIZE / 4; +- frame_count = 1; ++ elem_count = pages * PAGE_SIZE / 4; ++ frame_count = 1; + +- omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32, +- elem_count, frame_count, +- OMAP_DMA_SYNC_ELEMENT, +- 0, 0); ++ omap_set_dma_transfer_params(lch, OMAP_DMA_DATA_TYPE_S32, ++ elem_count, frame_count, ++ OMAP_DMA_SYNC_ELEMENT, ++ 0, 0); + +- omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC, ++ omap_set_dma_dest_params(lch, 0, OMAP_DMA_AMODE_POST_INC, + paddr, 0, 0); + + omap_set_dma_color_mode(lch, OMAP_DMA_CONSTANT_FILL, 0x000000); + +- omap_start_dma(lch); ++ omap_start_dma(lch); + + if (wait_for_completion_timeout(&compl, msecs_to_jiffies(1000)) == 0) { + omap_stop_dma(lch); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch b/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch new file mode 100644 index 0000000000..8633921979 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch @@ -0,0 +1,82 @@ +From 5d3426ae63c27b9405be8179beabe1e095b44a35 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 19:00:19 +0200 +Subject: [PATCH 63/69] DSS2: fix the usage of get_last_off_on_transaction_id + +The function returns int not unsigned since it can fail. Handle the +failing case as if the context had been lost. So now: + +1. No get_last_off_on_transaction_id func in platform data-> + never restore the context +2. Return val < 0 -> force the restore +3. Return val >= 0 do the restore only if the counter has changed. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/include/mach/display.h | 2 +- + drivers/video/omap2/dss/core.c | 18 ++++++++++++------ + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/display.h b/arch/arm/plat-omap/include/mach/display.h +index 45b16ca..31ebb96 100644 +--- a/arch/arm/plat-omap/include/mach/display.h ++++ b/arch/arm/plat-omap/include/mach/display.h +@@ -234,7 +234,7 @@ struct device; + + /* Board specific data */ + struct omap_dss_board_info { +- unsigned (*get_last_off_on_transaction_id)(struct device *dev); ++ int (*get_last_off_on_transaction_id)(struct device *dev); + int (*dsi_power_up)(void); + void (*dsi_power_down)(void); + int num_displays; +diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c +index ae7cd06..6d11b04 100644 +--- a/drivers/video/omap2/dss/core.c ++++ b/drivers/video/omap2/dss/core.c +@@ -38,7 +38,7 @@ + + static struct { + struct platform_device *pdev; +- unsigned ctx_id; ++ int ctx_id; + + struct clk *dss_ick; + struct clk *dss1_fck; +@@ -63,22 +63,28 @@ module_param_named(debug, dss_debug, bool, 0644); + #endif + + /* CONTEXT */ +-static unsigned dss_get_ctx_id(void) ++static int dss_get_ctx_id(void) + { + struct omap_dss_board_info *pdata = core.pdev->dev.platform_data; ++ int r; + + if (!pdata->get_last_off_on_transaction_id) + return 0; +- +- return pdata->get_last_off_on_transaction_id(&core.pdev->dev); ++ r = pdata->get_last_off_on_transaction_id(&core.pdev->dev); ++ if (r < 0) { ++ dev_err(&core.pdev->dev, ++ "getting transaction ID failed, will force context restore\n"); ++ r = -1; ++ } ++ return r; + } + + int dss_need_ctx_restore(void) + { + int id = dss_get_ctx_id(); + +- if (id != core.ctx_id) { +- DSSDBG("ctx id %u -> id %u\n", ++ if (id < 0 || id != core.ctx_id) { ++ DSSDBG("ctx id %d -> id %d\n", + core.ctx_id, id); + core.ctx_id = id; + return 1; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch b/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch new file mode 100644 index 0000000000..2ba9b1b1a2 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0064-VRFB-fix-debug-messages.patch @@ -0,0 +1,35 @@ +From 784271e9546844c5e69ec6d8f2fd3713847b6ab2 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 11:16:14 +0200 +Subject: [PATCH 64/69] VRFB: fix debug messages + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/vrfb.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 649803e..289fc8a 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -87,7 +87,7 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + u32 control; + + DBG("omapfb_set_vrfb(%d, %lx, %dx%d, %d)\n", ctx, paddr, +- width, height, bytespp); ++ width, height, color_mode); + + switch (color_mode) { + case OMAP_DSS_COLOR_RGB16: +@@ -127,7 +127,7 @@ void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, + vrfb_width = ALIGN(width * bytespp, VRFB_PAGE_WIDTH) / bytespp; + vrfb_height = ALIGN(height, VRFB_PAGE_HEIGHT); + +- DBG("vrfb w %u, h %u\n", vrfb_width, vrfb_height); ++ DBG("vrfb w %u, h %u bytespp %d\n", vrfb_width, vrfb_height, bytespp); + + size = vrfb_width << SMS_IMAGEWIDTH_OFFSET; + size |= vrfb_height << SMS_IMAGEHEIGHT_OFFSET; +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch b/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch new file mode 100644 index 0000000000..17f959cb27 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0065-VRFB-add-suspend-resume-functionality.patch @@ -0,0 +1,216 @@ +From 1269429fe6ddd6e5f15e3b4edb4fc2bcd6fc0410 Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Tue, 5 May 2009 11:16:13 +0200 +Subject: [PATCH 65/69] VRFB: add suspend/resume functionality + +At the moment the VRFB context is restored at each core power domain +OFF->ON transition. This is not optimal since the VRFB might be unused +temporarily for example when the screen is blanked. Add a suspend / +resume function to mark these unused periods during which we'll avoid +thea the context restore. + +Use atomic bitops for ctx_map for consistency. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/include/mach/vrfb.h | 2 + + arch/arm/plat-omap/vrfb.c | 75 ++++++++++++++++++++++++----- + drivers/video/omap2/omapfb/omapfb-main.c | 28 +++++++++++ + 3 files changed, 92 insertions(+), 13 deletions(-) + +diff --git a/arch/arm/plat-omap/include/mach/vrfb.h b/arch/arm/plat-omap/include/mach/vrfb.h +index ee6c062..9647d82 100644 +--- a/arch/arm/plat-omap/include/mach/vrfb.h ++++ b/arch/arm/plat-omap/include/mach/vrfb.h +@@ -39,6 +39,8 @@ struct vrfb + + extern int omap_vrfb_request_ctx(struct vrfb *vrfb); + extern void omap_vrfb_release_ctx(struct vrfb *vrfb); ++extern void omap_vrfb_suspend_ctx(struct vrfb *vrfb); ++extern void omap_vrfb_resume_ctx(struct vrfb *vrfb); + extern void omap_vrfb_adjust_size(u16 *width, u16 *height, + u8 bytespp); + extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 289fc8a..29f04e2 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -1,7 +1,9 @@ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/ioport.h> ++ + #include <asm/io.h> ++#include <asm/bitops.h> + + #include <mach/io.h> + #include <mach/vrfb.h> +@@ -37,7 +39,9 @@ + + #define VRFB_NUM_CTXS 12 + /* bitmap of reserved contexts */ +-static unsigned ctx_map; ++static unsigned long ctx_map; ++/* bitmap of contexts for which we have to keep the HW context valid */ ++static unsigned long ctx_map_active; + + /* + * Access to this happens from client drivers or the PM core after wake-up. +@@ -51,18 +55,23 @@ struct { + u32 size; + } vrfb_hw_context[VRFB_NUM_CTXS]; + ++static void inline restore_hw_context(int ctx) ++{ ++ omap_writel(vrfb_hw_context[ctx].control, SMS_ROT_CONTROL(ctx)); ++ omap_writel(vrfb_hw_context[ctx].size, SMS_ROT_SIZE(ctx)); ++ omap_writel(vrfb_hw_context[ctx].physical_ba, SMS_ROT_PHYSICAL_BA(ctx)); ++} ++ + void omap_vrfb_restore_context(void) + { + int i; ++ unsigned long map = ctx_map_active; + +- for (i = 0; i < VRFB_NUM_CTXS; i++) { +- /* Restore only the active contexts */ +- if (!(ctx_map & (1 << i))) +- continue; +- omap_writel(vrfb_hw_context[i].control, SMS_ROT_CONTROL(i)); +- omap_writel(vrfb_hw_context[i].size, SMS_ROT_SIZE(i)); +- omap_writel(vrfb_hw_context[i].physical_ba, +- SMS_ROT_PHYSICAL_BA(i)); ++ for (i = ffs(map); i; i = ffs(map)) { ++ /* i=1..32 */ ++ i--; ++ map &= ~(1 << i); ++ restore_hw_context(i); + } + } + +@@ -156,13 +165,20 @@ EXPORT_SYMBOL(omap_vrfb_setup); + void omap_vrfb_release_ctx(struct vrfb *vrfb) + { + int rot; ++ int ctx = vrfb->context; + +- if (vrfb->context == 0xff) ++ if (ctx == 0xff) + return; + +- DBG("release ctx %d\n", vrfb->context); ++ DBG("release ctx %d\n", ctx); + +- ctx_map &= ~(1 << vrfb->context); ++ if (!(ctx_map & (1 << ctx))) { ++ BUG(); ++ return; ++ } ++ WARN_ON(!(ctx_map_active & (1 << ctx))); ++ clear_bit(ctx, &ctx_map_active); ++ clear_bit(ctx, &ctx_map); + + for (rot = 0; rot < 4; ++rot) { + if(vrfb->paddr[rot]) { +@@ -194,7 +210,9 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) + + DBG("found free ctx %d\n", ctx); + +- ctx_map |= 1 << ctx; ++ set_bit(ctx, &ctx_map); ++ WARN_ON(ctx_map_active & (1 << ctx)); ++ set_bit(ctx, &ctx_map_active); + + memset(vrfb, 0, sizeof(*vrfb)); + +@@ -219,3 +237,34 @@ int omap_vrfb_request_ctx(struct vrfb *vrfb) + } + EXPORT_SYMBOL(omap_vrfb_request_ctx); + ++void omap_vrfb_suspend_ctx(struct vrfb *vrfb) ++{ ++ DBG("suspend ctx %d\n", vrfb->context); ++ if (vrfb->context >= VRFB_NUM_CTXS || ++ (!(1 << vrfb->context) & ctx_map_active)) { ++ BUG(); ++ return; ++ } ++ clear_bit(vrfb->context, &ctx_map_active); ++} ++EXPORT_SYMBOL(omap_vrfb_suspend_ctx); ++ ++void omap_vrfb_resume_ctx(struct vrfb *vrfb) ++{ ++ DBG("resume ctx %d\n", vrfb->context); ++ if (vrfb->context >= VRFB_NUM_CTXS || ++ ((1 << vrfb->context) & ctx_map_active)) { ++ BUG(); ++ return; ++ } ++ /* ++ * omap_vrfb_restore_context is normally called by the core domain ++ * save / restore logic, but since this VRFB context was suspended ++ * those calls didn't actually restore the context and now we might ++ * have an invalid context. Do an explicit restore here. ++ */ ++ restore_hw_context(vrfb->context); ++ set_bit(vrfb->context, &ctx_map_active); ++} ++EXPORT_SYMBOL(omap_vrfb_resume_ctx); ++ +diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c +index 76e7c6c..4bb74b7 100644 +--- a/drivers/video/omap2/omapfb/omapfb-main.c ++++ b/drivers/video/omap2/omapfb/omapfb-main.c +@@ -1036,6 +1036,30 @@ static int omapfb_setcmap(struct fb_cmap *cmap, struct fb_info *info) + return 0; + } + ++static void omapfb_vrfb_suspend_all(struct omapfb2_device *fbdev) ++{ ++ int i; ++ ++ for (i = 0; i < fbdev->num_fbs; i++) { ++ struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]); ++ ++ if (ofbi->region.vrfb.vaddr[0]) ++ omap_vrfb_suspend_ctx(&ofbi->region.vrfb); ++ } ++} ++ ++static void omapfb_vrfb_resume_all(struct omapfb2_device *fbdev) ++{ ++ int i; ++ ++ for (i = 0; i < fbdev->num_fbs; i++) { ++ struct omapfb_info *ofbi = FB2OFB(fbdev->fbs[i]); ++ ++ if (ofbi->region.vrfb.vaddr[0]) ++ omap_vrfb_resume_ctx(&ofbi->region.vrfb); ++ } ++} ++ + static int omapfb_blank(int blank, struct fb_info *fbi) + { + struct omapfb_info *ofbi = FB2OFB(fbi); +@@ -1051,6 +1075,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi) + if (display->state != OMAP_DSS_DISPLAY_SUSPENDED) + goto exit; + ++ omapfb_vrfb_resume_all(fbdev); ++ + if (display->resume) + r = display->resume(display); + +@@ -1073,6 +1099,8 @@ static int omapfb_blank(int blank, struct fb_info *fbi) + if (display->suspend) + r = display->suspend(display); + ++ omapfb_vrfb_suspend_all(fbdev); ++ + break; + + default: +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch b/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch new file mode 100644 index 0000000000..a3af90d959 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch @@ -0,0 +1,92 @@ +From 0201b40018d9e264f8c4ea7871223c94e0de61b1 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Thu, 7 May 2009 14:32:55 +0300 +Subject: [PATCH 66/69] DSS2: DSI: tune the timings to be more relaxed + +Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> +--- + drivers/video/omap2/dss/dsi.c | 37 +++++++++++++++++++++---------------- + 1 files changed, 21 insertions(+), 16 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 5225ed6..67ecfcf 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1396,28 +1396,28 @@ static void dsi_complexio_timings(void) + /* 1 * DDR_CLK = 2 * UI */ + + /* min 40ns + 4*UI max 85ns + 6*UI */ +- ths_prepare = ns2ddr(59) + 2; ++ ths_prepare = ns2ddr(70) + 2; + + /* min 145ns + 10*UI */ +- ths_prepare_ths_zero = ns2ddr(145) + 5; ++ ths_prepare_ths_zero = ns2ddr(175) + 2; + + /* min max(8*UI, 60ns+4*UI) */ +- ths_trail = max((unsigned)4, ns2ddr(60) + 2); ++ ths_trail = ns2ddr(60) + 5; + + /* min 100ns */ +- ths_exit = ns2ddr(100); ++ ths_exit = ns2ddr(145); + + /* tlpx min 50n */ + tlpx_half = ns2ddr(25); + + /* min 60ns */ +- tclk_trail = ns2ddr(60); ++ tclk_trail = ns2ddr(60) + 2; + + /* min 38ns, max 95ns */ +- tclk_prepare = ns2ddr(38); ++ tclk_prepare = ns2ddr(65); + + /* min tclk-prepare + tclk-zero = 300ns */ +- tclk_zero = ns2ddr(300 - 38); ++ tclk_zero = ns2ddr(260); + + DSSDBG("ths_prepare %u (%uns), ths_prepare_ths_zero %u (%uns)\n", + ths_prepare, ddr2ns(ths_prepare), +@@ -2340,9 +2340,19 @@ static void dsi_proto_timings(struct omap_display *display) + /* min 60ns + 52*UI */ + tclk_post = ns2ddr(60) + 26; + ++ /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ ++ if (display->hw_config.u.dsi.data1_lane != 0 && ++ display->hw_config.u.dsi.data2_lane != 0) ++ ths_eot = 2; ++ else ++ ths_eot = 4; ++ + ddr_clk_pre = DIV_ROUND_UP(tclk_pre + tlpx + tclk_zero + tclk_prepare, + 4); +- ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4); ++ ddr_clk_post = DIV_ROUND_UP(tclk_post + tclk_trail, 4) + ths_eot; ++ ++ BUG_ON(ddr_clk_pre == 0 || ddr_clk_pre > 255); ++ BUG_ON(ddr_clk_post == 0 || ddr_clk_post > 255); + + r = dsi_read_reg(DSI_CLK_TIMING); + r = FLD_MOD(r, ddr_clk_pre, 15, 8); +@@ -2353,14 +2363,9 @@ static void dsi_proto_timings(struct omap_display *display) + ddr_clk_pre, + ddr_clk_post); + +- /* ths_eot is 2 for 2 datalanes and 4 for 1 datalane */ +- if (display->hw_config.u.dsi.data1_lane != 0 && +- display->hw_config.u.dsi.data2_lane != 0) +- ths_eot = 2; +- else +- ths_eot = 4; +- +- enter_hs_mode_lat = DIV_ROUND_UP(tlpx + ths_prepare + ths_zero, 4) + 4; ++ enter_hs_mode_lat = 1 + DIV_ROUND_UP(tlpx, 4) + ++ DIV_ROUND_UP(ths_prepare, 4) + ++ DIV_ROUND_UP(ths_zero + 3, 4); + exit_hs_mode_lat = DIV_ROUND_UP(ths_trail + ths_exit, 4) + 1 + ths_eot; + + r = FLD_VAL(enter_hs_mode_lat, 31, 16) | +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch b/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch new file mode 100644 index 0000000000..911fe79bfa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch @@ -0,0 +1,29 @@ +From c474849d7aff57d578c639f63a9c3cbdec0501dd Mon Sep 17 00:00:00 2001 +From: Imre Deak <imre.deak@nokia.com> +Date: Mon, 11 May 2009 15:15:52 +0200 +Subject: [PATCH 67/69] DSS2: VRFB: don't WARN when releasing inactive ctx + +Releasing an inactive context is valid, it can happen when +the application first blanks the screen then frees the +framebuffer. + +Signed-off-by: Imre Deak <imre.deak@nokia.com> +--- + arch/arm/plat-omap/vrfb.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/vrfb.c b/arch/arm/plat-omap/vrfb.c +index 29f04e2..34395c2 100644 +--- a/arch/arm/plat-omap/vrfb.c ++++ b/arch/arm/plat-omap/vrfb.c +@@ -176,7 +176,6 @@ void omap_vrfb_release_ctx(struct vrfb *vrfb) + BUG(); + return; + } +- WARN_ON(!(ctx_map_active & (1 << ctx))); + clear_bit(ctx, &ctx_map_active); + clear_bit(ctx, &ctx_map); + +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch new file mode 100644 index 0000000000..fba2ebd5db --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch @@ -0,0 +1,65 @@ +From 0db37fa025f0eac64f9fdad49e310d7660f48944 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@nokia.com> +Date: Tue, 12 May 2009 14:38:05 +0200 +Subject: [PATCH 68/69] DSS2: Swap field offset values w/ VRFB rotation +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +The field 0 and field 1 offset values were still incorrect when VRFB +rotation is used. Swap them to put the fields into proper order. + +Signed-off-by: Ville Syrjälä <ville.syrjala@nokia.com> +--- + drivers/video/omap2/dss/dispc.c | 17 +++++++++++------ + 1 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 5fc9457..b0e4960 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1182,6 +1182,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + + DSSDBG("calc_rot(%d): scrw %d, %dx%d\n", rotation, screen_width, + width, height); ++ ++ /* ++ * field 0 = even field = bottom field ++ * field 1 = odd field = top field ++ */ + switch (rotation + mirror * 4) { + case 0: + case 2: +@@ -1194,11 +1199,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + width = width >> 1; + case 1: + case 3: +- *offset0 = 0; ++ *offset1 = 0; + if (fieldmode) +- *offset1 = screen_width * ps; ++ *offset0 = screen_width * ps; + else +- *offset1 = 0; ++ *offset0 = 0; + + *row_inc = pixinc(1 + (screen_width - width) + + (fieldmode ? screen_width : 0), +@@ -1216,11 +1221,11 @@ static void calc_vrfb_rotation_offset(u8 rotation, bool mirror, + width = width >> 1; + case 5: + case 7: +- *offset0 = 0; ++ *offset1 = 0; + if (fieldmode) +- *offset1 = screen_width * ps; ++ *offset0 = screen_width * ps; + else +- *offset1 = 0; ++ *offset0 = 0; + *row_inc = pixinc(1 - (screen_width + width) - + (fieldmode ? screen_width : 0), + ps); +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch b/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch new file mode 100644 index 0000000000..c637c48602 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch @@ -0,0 +1,125 @@ +From b06406f3e5c3958f69185314c969f7c1a3265f71 Mon Sep 17 00:00:00 2001 +From: Hardik Shah <hardik.shah@ti.com> +Date: Thu, 14 May 2009 15:04:17 +0530 +Subject: [PATCH 69/69] DSS2: OMAP3EVM: Added DSI powerup and powerdown functions + +Copied fom 3430sdp implementation. + +Signed-off-by: Hardik Shah <hardik.shah@ti.com> +--- + arch/arm/mach-omap2/board-omap3evm.c | 62 +++++++++++++++++++++------------- + 1 files changed, 38 insertions(+), 24 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c +index 6f5a866..57c4fc7 100644 +--- a/arch/arm/mach-omap2/board-omap3evm.c ++++ b/arch/arm/mach-omap2/board-omap3evm.c +@@ -237,6 +237,38 @@ static int __init omap3_evm_i2c_init(void) + static int lcd_enabled; + static int dvi_enabled; + ++static void enable_vpll2(int enable) ++{ ++ u8 ded_val, grp_val; ++ ++ if (enable) { ++ ded_val = ENABLE_VPLL2_DEDICATED; ++ grp_val = ENABLE_VPLL2_DEV_GRP; ++ } else { ++ ded_val = 0; ++ grp_val = 0; ++ } ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ ded_val, TWL4030_VPLL2_DEDICATED); ++ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, ++ grp_val, TWL4030_VPLL2_DEV_GRP); ++} ++ ++static int omap3evm_dsi_power_up(void) ++{ ++ if (omap_rev() > OMAP3430_REV_ES1_0) ++ enable_vpll2(1); ++ return 0; ++} ++ ++static void omap3evm_dsi_power_down(void) ++{ ++ if (omap_rev() > OMAP3430_REV_ES1_0) ++ enable_vpll2(0); ++} ++ ++ + static void __init omap3_evm_display_init(void) + { + int r; +@@ -306,12 +338,7 @@ static int omap3_evm_panel_enable_lcd(struct omap_display *display) + printk(KERN_ERR "cannot enable LCD, DVI is enabled\n"); + return -EINVAL; + } +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); +- } ++ omap3evm_dsi_power_up(); + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 0); + lcd_enabled = 1; + return 0; +@@ -319,12 +346,7 @@ static int omap3_evm_panel_enable_lcd(struct omap_display *display) + + static void omap3_evm_panel_disable_lcd(struct omap_display *display) + { +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEV_GRP); +- } ++ omap3evm_dsi_power_down(); + gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1); + lcd_enabled = 0; + } +@@ -370,13 +392,8 @@ static int omap3_evm_panel_enable_dvi(struct omap_display *display) + printk(KERN_ERR "cannot enable DVI, LCD is enabled\n"); + return -EINVAL; + } +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, +- ENABLE_VPLL2_DEV_GRP, TWL4030_VPLL2_DEV_GRP); +- } + ++ omap3evm_dsi_power_up(); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, + TWL4030_GPIODATA_IN3); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x80, +@@ -388,13 +405,8 @@ static int omap3_evm_panel_enable_dvi(struct omap_display *display) + + static void omap3_evm_panel_disable_dvi(struct omap_display *display) + { +- if (omap_rev() > OMAP3430_REV_ES1_0) { +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEDICATED); +- twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0, +- TWL4030_VPLL2_DEV_GRP); +- } + ++ omap3evm_dsi_power_down(); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, + TWL4030_GPIODATA_IN3); + twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00, +@@ -413,6 +425,8 @@ static struct omap_dss_display_config omap3_evm_display_data_dvi = { + }; + + static struct omap_dss_board_info omap3_evm_dss_data = { ++ .dsi_power_up = omap3evm_dsi_power_up, ++ .dsi_power_down = omap3evm_dsi_power_down, + .num_displays = 3, + .displays = { + &omap3_evm_display_data, +-- +1.6.2.4 + diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index f0769f8556..f9439ebc7c 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -75,6 +75,22 @@ SRC_URI_append = " \ file://dss2/0051-DSS2-VRAM-use-debugfs-not-procfs.patch;patch=1 \ file://dss2/0052-DSS2-VRAM-fix-section-mismatch-warning.patch;patch=1 \ file://dss2/0053-DSS2-disable-LCD-DIGIT-before-resetting-DSS.patch;patch=1 \ + file://dss2/0054-DSS2-DSI-more-error-handling.patch;patch=1 \ + file://dss2/0055-DSS2-Added-global-alpha-support.patch;patch=1 \ + file://dss2/0056-DSS2-Rotation-attrs-for-YUV-need-not-to-be-reversed.patch;patch=1 \ + file://dss2/0057-DSS2-Documentation-update-for-new-sysfs-entries-in.patch;patch=1 \ + file://dss2/0058-DSS2-Don-t-touch-plane-coordinates-when-changing-fb.patch;patch=1 \ + file://dss2/0059-DSS2-DSI-configure-ENTER-EXIT_HS_MODE_LATENCY.patch;patch=1 \ + file://dss2/0060-DSS2-Avoid-div-by-zero-when-calculating-required-fc.patch;patch=1 \ + file://dss2/0061-DSS2-VRFB-save-restore-context.patch;patch=1 \ + file://dss2/0062-DSS2-VRAM-Fix-indentation.patch;patch=1 \ + file://dss2/0063-DSS2-fix-the-usage-of-get_last_off_on_transaction_i.patch;patch=1 \ + file://dss2/0064-VRFB-fix-debug-messages.patch;patch=1 \ + file://dss2/0065-VRFB-add-suspend-resume-functionality.patch;patch=1 \ + file://dss2/0066-DSS2-DSI-tune-the-timings-to-be-more-relaxed.patch;patch=1 \ + file://dss2/0067-DSS2-VRFB-don-t-WARN-when-releasing-inactive-ctx.patch;patch=1 \ + file://dss2/0068-DSS2-Swap-field-offset-values-w-VRFB-rotation.patch;patch=1 \ + file://dss2/0069-DSS2-OMAP3EVM-Added-DSI-powerup-and-powerdown-func.patch;patch=1 \ file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \ file://fix-unaligned-access.diff;patch=1 \ file://make-alignment-visible.diff;patch=1 \ diff --git a/recipes/minilite/minilite.inc b/recipes/minilite/minilite.inc new file mode 100644 index 0000000000..79f28e0da3 --- /dev/null +++ b/recipes/minilite/minilite.inc @@ -0,0 +1,12 @@ +inherit gpe +LICENSE = "GPL" +DEPENDS = "libgpewidget" +SECTION = "gpe" + +DESCRIPTION = "GPE Screen light control dockapp" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +SRC_URI += "file://makefile-fix.patch;patch=1" + +export CVSBUILD="no" diff --git a/recipes/minilite/minilite_0.41.bb b/recipes/minilite/minilite_0.41.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.41.bb +++ b/recipes/minilite/minilite_0.41.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.43.bb b/recipes/minilite/minilite_0.43.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.43.bb +++ b/recipes/minilite/minilite_0.43.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.44.bb b/recipes/minilite/minilite_0.44.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.44.bb +++ b/recipes/minilite/minilite_0.44.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.47.bb b/recipes/minilite/minilite_0.47.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.47.bb +++ b/recipes/minilite/minilite_0.47.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.48.bb b/recipes/minilite/minilite_0.48.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.48.bb +++ b/recipes/minilite/minilite_0.48.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.49.bb b/recipes/minilite/minilite_0.49.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.49.bb +++ b/recipes/minilite/minilite_0.49.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/minilite/minilite_0.50.bb b/recipes/minilite/minilite_0.50.bb index 79f28e0da3..2824977232 100644 --- a/recipes/minilite/minilite_0.50.bb +++ b/recipes/minilite/minilite_0.50.bb @@ -1,12 +1 @@ -inherit gpe -LICENSE = "GPL" -DEPENDS = "libgpewidget" -SECTION = "gpe" - -DESCRIPTION = "GPE Screen light control dockapp" - -SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" - -SRC_URI += "file://makefile-fix.patch;patch=1" - -export CVSBUILD="no" +require minilite.inc diff --git a/recipes/opie-packagemanager/files/opkg.patch b/recipes/opie-packagemanager/files/opkg.patch new file mode 100644 index 0000000000..bf6b18ab69 --- /dev/null +++ b/recipes/opie-packagemanager/files/opkg.patch @@ -0,0 +1,562 @@ +Index: packagemanager/installdlg.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/installdlg.cpp,v +retrieving revision 1.16 +diff -u -d -r1.16 installdlg.cpp +--- packagemanager/installdlg.cpp 5 Jun 2005 22:41:15 -0000 1.16 ++++ packagemanager/installdlg.cpp 18 May 2009 21:03:02 -0000 +@@ -45,6 +45,7 @@ + #include <qmap.h> + #include <qmultilineedit.h> + #include <qpushbutton.h> ++#include <qprogressbar.h> + + #include <sys/vfs.h> + +@@ -130,16 +131,21 @@ + groupBoxLayout->addWidget( m_output ); + layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 ); + ++ m_progressBar = new QProgressBar( this ); ++ m_progressBar->setTotalSteps( 100 ); ++ m_progressBar->hide(); ++ layout->addMultiCellWidget( m_progressBar, 3, 3, 0, 1 ); ++ + m_btnStart = new QPushButton( Opie::Core::OResource::loadPixmap( "packagemanager/apply", + Opie::Core::OResource::SmallIcon ), tr( "Start" ), this ); + m_btnStart->setMinimumHeight( AppLnk::smallIconSize() ); +- layout->addWidget( m_btnStart, 3, 0 ); ++ layout->addWidget( m_btnStart, 4, 0 ); + connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) ); + + m_btnOptions = new QPushButton( Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), + tr( "Options" ), this ); + m_btnOptions->setMinimumHeight( AppLnk::smallIconSize() ); +- layout->addWidget( m_btnOptions, 3, 1 ); ++ layout->addWidget( m_btnOptions, 4, 1 ); + connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) ); + + // Display packages being acted upon in output widget +@@ -251,13 +257,23 @@ + m_btnStart->setEnabled( false ); + } + ++ connect( m_packman, SIGNAL(signalProgress(const QString &, int)), this, SLOT(slotProgress(const QString &, int)) ); ++ ++ m_progressBar->show(); ++ + for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ ) + { ++ m_progressBar->reset(); + // Execute next command + m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest, + this, SLOT(slotOutput(const QString &)), true ); + } + ++ slotOutput( tr("Completed") ); ++ m_progressBar->hide(); ++ ++ disconnect( m_packman, SIGNAL(signalProgress(const QString &, int)), this, SLOT(slotProgress(const QString &, int)) ); ++ + // All commands executed, allow user to close dialog + m_btnStart->setEnabled( true ); + m_btnStart->setText( tr( "Close" ) ); +@@ -314,3 +330,15 @@ + // Update available space + slotDisplayAvailSpace( QString::null ); + } ++ ++void InstallDlg::slotProgress( const QString &msg, int percentage ) ++{ ++ static QString lastmsg = ""; ++ if( lastmsg != msg ) { ++ slotOutput( msg ); ++ lastmsg = msg; ++ } ++ ++ m_progressBar->setProgress( percentage ); ++} ++ +Index: packagemanager/installdlg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/installdlg.h,v +retrieving revision 1.9 +diff -u -d -r1.9 installdlg.h +--- packagemanager/installdlg.h 5 Jun 2005 22:18:10 -0000 1.9 ++++ packagemanager/installdlg.h 18 May 2009 21:03:02 -0000 +@@ -39,6 +39,7 @@ + class QLabel; + class QMultiLineEdit; + class QPushButton; ++class QProgressBar; + + class OConfItem; + class OPackageManager; +@@ -69,6 +70,7 @@ + QMultiLineEdit *m_output; // Multi-line edit to display status + QPushButton *m_btnStart; // Start/abort/close button + QPushButton *m_btnOptions; // Installation options button ++ QProgressBar *m_progressBar; + + // Commands and packages to execute + int m_numCommands; // Number of commands to be executed +@@ -85,6 +87,7 @@ + + // Execution slots + void slotOutput( const QString &msg ); ++ void slotProgress( const QString &msg, int percentage ); + + signals: + void closeInstallDlg(); +Index: packagemanager/mainwindow.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/mainwindow.cpp,v +retrieving revision 1.18 +diff -u -d -r1.18 mainwindow.cpp +--- packagemanager/mainwindow.cpp 5 Jun 2005 22:41:15 -0000 1.18 ++++ packagemanager/mainwindow.cpp 18 May 2009 21:03:02 -0000 +@@ -178,8 +178,8 @@ + QAction *actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); + actionDownload->setWhatsThis( tr( "Tap here to download the currently selected package(s)." ) ); + connect( actionDownload, SIGNAL(activated()), this, SLOT(slotDownload()) ); +- actionDownload->addTo( popup ); +- actionDownload->addTo( &m_toolBar ); ++//X actionDownload->addTo( popup ); ++//X actionDownload->addTo( &m_toolBar ); + + a = new QAction( tr( "Apply changes" ), Opie::Core::OResource::loadPixmap( "packagemanager/apply", + Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); +Index: packagemanager/oipkg.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v +retrieving revision 1.25 +diff -u -d -r1.25 oipkg.cpp +--- packagemanager/oipkg.cpp 11 May 2009 21:55:52 -0000 1.25 ++++ packagemanager/oipkg.cpp 18 May 2009 21:03:03 -0000 +@@ -39,21 +39,60 @@ + #include <stdlib.h> + #include <unistd.h> + +-extern "C" { +-#include <libipkg.h> +-}; +-args_t m_ipkgArgs; // libipkg configuration arguments +- +-const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file +-const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files +-const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists +-const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location +-const QString IPKG_INFO_PATH = "usr/lib/ipkg/info"; // Package file lists location ++const QString IPKG_CONF = "/etc/opkg.conf"; // Fully-qualified name of Ipkg primary configuration file ++const QString IPKG_CONF_DIR = "/etc/opkg"; // Directory of secondary Ipkg configuration files ++const QString IPKG_PKG_PATH = "/usr/lib/opkg/lists"; // Directory containing server package lists ++const QString IPKG_STATUS_PATH = "usr/lib/opkg/status"; // Destination status file location ++const QString IPKG_INFO_PATH = "usr/lib/opkg/info"; // Package file lists location + + OIpkg *oipkg; + + // Ipkg callback functions + ++ ++void fsignalOpkgProgress (opkg_t *opkg, const opkg_progress_data_t *progress, void *user_data) ++{ ++ QString msg; ++ ++ QString pkginfo; ++ if( progress->package ) { ++ pkginfo = progress->package->name; ++ pkginfo += " "; ++ pkginfo += progress->package->version; ++ } ++ switch( progress->action ) { ++ case OPKG_INSTALL: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Installing %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Installing"); ++ break; ++ case OPKG_REMOVE: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Removing %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Removing"); ++ break; ++ case OPKG_DOWNLOAD: ++ if( pkginfo != "" ) ++ msg = QObject::tr("Downloading %1").arg( pkginfo ); ++ else ++ msg = QObject::tr("Downloading"); ++ break; ++ default: ++ msg = QObject::tr("Processing"); ++ } ++ msg += "..."; ++ oipkg->progress( (const char *)msg, progress->percentage ); ++} ++ ++void fsignalOpkgPackage (opkg_t *opkg, opkg_package_t *package, void *user_data) ++{ ++ ++} ++ ++ ++/*X + int fsignalIpkgMessage( ipkg_conf_t *conf, message_level_t level, char *msg ) + { + // Display message only if it is below the message level threshold +@@ -64,6 +103,7 @@ + + return 0; + } ++*/ + + char *fIpkgResponse( char */*question*/ ) + { +@@ -76,13 +116,41 @@ + return 0; + } + +-int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, +- void */*userdata*/ ) ++QString opkg_error_message( int err ) + { +- oipkg->ipkgList( desc ); +- return 0; ++ switch(err) { ++ case OPKG_NO_ERROR: ++ return "Success"; ++ case OPKG_UNKNOWN_ERROR: ++ return "Unknown error"; ++ case OPKG_DOWNLOAD_FAILED: ++ return "Download failed"; ++ case OPKG_DEPENDENCIES_FAILED: ++ return "Unable to complete operation due to dependencies"; ++ case OPKG_PACKAGE_ALREADY_INSTALLED: ++ return "Specified package is already installed"; ++ case OPKG_PACKAGE_NOT_AVAILABLE: ++ return "Specified package is not available"; ++ case OPKG_PACKAGE_NOT_FOUND: ++ return "Specified package could not be found"; ++ case OPKG_PACKAGE_NOT_INSTALLED: ++ return "Specified package is not installed"; ++ case OPKG_GPG_ERROR: ++ return "GPG verification failed"; ++ case OPKG_MD5_ERROR: ++ return "MD5 verification failed"; ++ default: ++ return "Unrecognised error code"; ++ } + } + ++//Xint fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_t /*status*/, ++//X void */*userdata*/ ) ++//X{ ++//X oipkg->ipkgList( desc ); ++//X return 0; ++//X} ++ + OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) + : QObject( parent, name ) + , m_config( config ) +@@ -94,11 +162,7 @@ + oipkg = this; + + // Initialize libipkg +- ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); +- +- // Default ipkg run-time arguments +- m_ipkgArgs.noaction = false; +- m_ipkgArgs.force_defaults = true; ++ m_opkg = opkg_new(); + } + + OIpkg::~OIpkg() +@@ -108,7 +172,7 @@ + m_confInfo->setAutoDelete( true ); + + // Free up libipkg resources +- ipkg_deinit( &m_ipkgArgs ); ++ opkg_free( m_opkg ); + } + + OConfItemList *OIpkg::configItems() +@@ -237,10 +301,7 @@ + } + + // Reinitialize libipkg to pick up new configuration +- ipkg_deinit( &m_ipkgArgs ); +- ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); +- m_ipkgArgs.noaction = false; +- m_ipkgArgs.force_defaults = true; ++ opkg_re_read_config_files( m_opkg ); + } + + void OIpkg::saveSettings() +@@ -430,17 +491,29 @@ + bool OIpkg::executeCommand( OPackage::Command command, const QStringList ¶meters, const QString &destination, + const QObject *receiver, const char *slotOutput, bool rawOutput ) + { ++ int optvalue; ++ + if ( command == OPackage::NotDefined ) + return false; + + // Set ipkg run-time options/arguments +- m_ipkgArgs.force_depends = ( m_ipkgExecOptions & FORCE_DEPENDS ); +- m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); +- // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); +- m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); +- m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); ++ optvalue = ( m_ipkgExecOptions & FORCE_DEPENDS ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_depends", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_REINSTALL ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_reinstall", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_OVERWRITE ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_overwrite", &optvalue ); ++ ++ optvalue = ( m_ipkgExecOptions & FORCE_RECURSIVE ) ? 1 : 0; ++ opkg_set_option( m_opkg, "force_removal_of_dependent_packages", &optvalue ); ++ ++ optvalue = m_ipkgExecVerbosity; ++ opkg_set_option( m_opkg, "verbosity", &optvalue ); ++ ++/*X // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); + m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); +- m_ipkgArgs.verbosity = m_ipkgExecVerbosity; + if ( m_ipkgArgs.dest ) + free( m_ipkgArgs.dest ); + if ( !destination.isNull() ) +@@ -452,7 +525,7 @@ + } + else + m_ipkgArgs.dest = 0l; +- ++*/ + // Connect output signal to widget + + if ( !rawOutput ) +@@ -460,17 +533,29 @@ + // TODO - connect to local slot and parse output before emitting signalIpkgMessage + } + ++ int ret = 0; ++ + switch( command ) + { + case OPackage::Update : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ipkg_lists_update( &m_ipkgArgs ); ++ ret = opkg_update_package_lists( m_opkg, &fsignalOpkgProgress, NULL ); + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Update failed: ") + opkg_error_message( ret ) ); ++ return false; ++ } + }; + break; + case OPackage::Upgrade : { + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); +- ipkg_packages_upgrade( &m_ipkgArgs ); ++ ret = opkg_upgrade_all( m_opkg, &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Upgrade failed: ") + opkg_error_message( ret ) ); ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + + // Re-link non-root destinations to make sure everything is in sync + OConfItemList *destList = destinations(); +@@ -489,7 +574,12 @@ + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +- ipkg_packages_install( &m_ipkgArgs, (*it) ); ++ ret = opkg_install_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ emit signalIpkgMessage( tr("Install failed: ") + opkg_error_message( ret ) ); ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + } + if ( destination != "root" ) + linkPackageDir( destination ); +@@ -505,7 +595,18 @@ + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { + unlinkPackage( (*it), destList ); +- ipkg_packages_remove( &m_ipkgArgs, (*it), true ); ++ ret = opkg_remove_package( m_opkg, (*it), &fsignalOpkgProgress, NULL ); ++ if( ret != OPKG_NO_ERROR ) { ++ if ( ret == OPKG_DEPENDENCIES_FAILED || ret == OPKG_UNKNOWN_ERROR ) { ++ emit signalIpkgMessage( tr("Remove failed: other package(s) depend on the specified package") ); ++ } ++ else { ++ emit signalIpkgMessage( tr("Remove failed: ") + opkg_error_message( ret ) ); ++ } ++ delete destList; ++ disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); ++ return false; ++ } + } + + delete destList; +@@ -516,20 +617,38 @@ + connect( this, SIGNAL(signalIpkgMessage(const QString &)), receiver, slotOutput ); + for ( QStringList::ConstIterator it = parameters.begin(); it != parameters.end(); ++it ) + { +- ipkg_packages_download( &m_ipkgArgs, (*it) ); ++//X ipkg_packages_download( &m_ipkgArgs, (*it) ); + } + disconnect( this, SIGNAL(signalIpkgMessage(const QString &)), 0, 0 ); + }; + break; + case OPackage::Info : { + connect( this, SIGNAL(signalIpkgStatus(const QString &)), receiver, slotOutput ); +- ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); ++//X ipkg_packages_info( &m_ipkgArgs, (*parameters.begin()), &fIpkgStatus, 0l ); ++ opkg_package_t *pkginfo = opkg_find_package( m_opkg, (*parameters.begin()), NULL, NULL, NULL ); ++ if(pkginfo) { ++ QString msg = tr("Package: %1\n").arg( pkginfo->name ); ++ msg += tr("Version: %1\n").arg( pkginfo->version ); ++ msg += tr("Architecture: %1\n").arg( pkginfo->architecture ); ++ if( pkginfo->repository ) ++ msg += tr("Repository: %1\n").arg( pkginfo->repository ); ++ if( pkginfo->description ) ++ msg += tr("Description: %1\n\n").arg( pkginfo->description ); ++ if( pkginfo->tags ) ++ msg += tr("Tags: %1\n").arg( pkginfo->tags ); ++ if( pkginfo->url ) ++ msg += tr("URL: %1\n").arg( pkginfo->url ); ++ if( pkginfo->size > 0 ) ++ msg += tr("Size: %1\n").arg( pkginfo->size ); ++ msg += tr("Status: %1").arg( pkginfo->installed ? tr("installed") : "" ); ++ emit signalIpkgStatus( msg ); ++ } + disconnect( this, SIGNAL(signalIpkgStatus(const QString &)), 0, 0 ); + }; + break; + case OPackage::Files : { + connect( this, SIGNAL(signalIpkgList(const QString &)), receiver, slotOutput ); +- ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); ++//X ipkg_package_files( &m_ipkgArgs, (*parameters.begin()), &fIpkgFiles, 0l ); + disconnect( this, SIGNAL(signalIpkgList(const QString &)), 0, 0 ); + }; + break; +@@ -539,7 +658,7 @@ + return true; + } + +-void OIpkg::ipkgMessage( char *msg ) ++void OIpkg::ipkgMessage( const char *msg ) + { + emit signalIpkgMessage( msg ); + } +@@ -554,6 +673,11 @@ + emit signalIpkgList( filelist ); + } + ++void OIpkg::progress( const QString &msg, int percentage ) ++{ ++ emit signalProgress( msg, percentage ); ++} ++ + void OIpkg::loadConfiguration() + { + if ( m_confInfo ) +Index: packagemanager/oipkg.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v +retrieving revision 1.10 +diff -u -d -r1.10 oipkg.h +--- packagemanager/oipkg.h 17 May 2009 21:33:07 -0000 1.10 ++++ packagemanager/oipkg.h 18 May 2009 21:03:03 -0000 +@@ -38,6 +38,10 @@ + + #include <qobject.h> + ++extern "C" { ++#include <opkg.h> ++}; ++ + // Ipkg execution options (m_ipkgExecOptions) + #define FORCE_DEPENDS 0x0001 + #define FORCE_REMOVE 0x0002 +@@ -86,9 +90,11 @@ + bool rawOutput = true ); + void abortCommand(); + +- void ipkgMessage( char *msg ); ++ void ipkgMessage( const char *msg ); + void ipkgStatus( char *status ); + void ipkgList( char *filelist ); ++ void progressInit(); ++ void progress( const QString &msg, int percentage ); + + private: + Config *m_config; // Pointer to application configuration file +@@ -96,6 +102,7 @@ + int m_ipkgExecOptions; // Bit-mapped flags for Ipkg execution options + int m_ipkgExecVerbosity; // Ipkg execution verbosity level + QString m_rootPath; // Directory path where the 'root' destination is located ++ opkg_t *m_opkg; + + void loadConfiguration(); + OConfItemList *filterConfItems( OConfItem::Type typefilter = OConfItem::NotDefined ); +@@ -108,6 +115,8 @@ + void signalIpkgMessage( const QString &msg ); + void signalIpkgStatus( const QString &status ); + void signalIpkgList( const QString &filelist ); ++ void signalProgressInit(); ++ void signalProgress( const QString &msg, int percentage ); + }; + + #endif +Index: packagemanager/opackagemanager.cpp +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/opackagemanager.cpp,v +retrieving revision 1.10 +diff -u -d -r1.10 opackagemanager.cpp +--- packagemanager/opackagemanager.cpp 5 Jun 2005 22:18:10 -0000 1.10 ++++ packagemanager/opackagemanager.cpp 18 May 2009 21:03:03 -0000 +@@ -43,6 +43,7 @@ + , m_categories() + { + m_packages.setAutoDelete( true ); ++ connect( &m_ipkg, SIGNAL(signalProgress(const QString &, int)), this, SIGNAL(signalProgress(const QString &, int)) ); + } + + void OPackageManager::loadAvailablePackages() +Index: packagemanager/opackagemanager.h +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/opackagemanager.h,v +retrieving revision 1.6 +diff -u -d -r1.6 opackagemanager.h +--- packagemanager/opackagemanager.h 5 Jun 2005 22:18:10 -0000 1.6 ++++ packagemanager/opackagemanager.h 18 May 2009 21:03:03 -0000 +@@ -89,6 +89,7 @@ + void initStatus( int numSteps ); + void statusText( const QString &status ); + void statusBar( int currStep ); ++ void signalProgress( const QString &msg, int percentage ); + }; + + #endif +Index: packagemanager/packagemanager.pro +=================================================================== +RCS file: /cvs/opie/noncore/settings/packagemanager/packagemanager.pro,v +retrieving revision 1.9 +diff -u -d -r1.9 packagemanager.pro +--- packagemanager/packagemanager.pro 24 Dec 2004 20:13:38 -0000 1.9 ++++ packagemanager/packagemanager.pro 18 May 2009 21:03:03 -0000 +@@ -29,7 +29,7 @@ + TARGET = packagemanager + INCLUDEPATH += $(OPIEDIR)/include + DEPENDPATH += $(OPIEDIR)/include +-LIBS += -lqpe -lopiecore2 -lopieui2 -lipkg ++LIBS += -lqpe -lopiecore2 -lopieui2 -lopkg + + include( $(OPIEDIR)/include.pro ) + diff --git a/recipes/opie-packagemanager/files/split-config.patch b/recipes/opie-packagemanager/files/split-config.patch new file mode 100644 index 0000000000..1feb6aea68 --- /dev/null +++ b/recipes/opie-packagemanager/files/split-config.patch @@ -0,0 +1,332 @@ +--- packagemanager/oipkg.cpp 2009-05-11 23:06:48.000000000 +0100 ++++ packagemanager/oipkg.cpp 2009-05-11 23:06:50.000000000 +0100 +@@ -30,6 +30,8 @@ + + #include "oipkg.h" + ++#include <opie2/odebug.h> ++ + #include <qdir.h> + #include <qfile.h> + #include <qtextstream.h> +@@ -133,6 +135,26 @@ + return filterConfItems( OConfItem::Option ); + } + ++void OIpkg::defaultConfItemFile( OConfItem *item ) ++{ ++ if( item->file().isNull() ) ++ { ++ switch ( item->type() ) ++ { ++ case OConfItem::Source : ++ case OConfItem::Destination : ++ item->setFile( IPKG_CONF_DIR + "/" + item->name() + ".conf" ); ++ break; ++ case OConfItem::Arch : ++ item->setFile( IPKG_CONF_DIR + "/arch.conf" ); ++ break; ++ default : ++ item->setFile( IPKG_CONF ); ++ break; ++ }; ++ } ++} ++ + void OIpkg::setConfigItems( OConfItemList *configList ) + { + if ( m_confInfo ) +@@ -140,84 +162,78 @@ + + m_confInfo = configList; + +- // Write out new /etc/ipkg.conf +- QFile confFile( IPKG_CONF ); +- if ( confFile.open( IO_WriteOnly ) ) ++ // Write out new config files ++ QString lastFile = ""; ++ QFile *confFile = NULL; ++ QTextStream *confStream = NULL; ++ OConfItemListIterator it( *m_confInfo ); ++ for ( ; it.current(); ++it ) + { +- QTextStream confStream( &confFile ); +- confStream << "# Generated by Opie Package Manager\n\n"; ++ OConfItem *item = it.current(); + +- OConfItemListIterator it( *m_confInfo ); +- for ( ; it.current(); ++it ) ++ // Only write out valid conf items ++ if ( item->type() != OConfItem::NotDefined ) + { +- OConfItem *item = it.current(); ++ if ( lastFile != item->file() ) { ++ if ( confFile ) { ++ confFile->close(); ++ delete confStream; ++ delete confFile; ++ } ++ odebug << "Opening " << item->file() << oendl; ++ confFile = new QFile( item->file() ); ++ if ( ! confFile->open( IO_WriteOnly ) ) { ++ owarn << "Failed to open " << item->file() << oendl; ++ delete confFile; ++ confFile = NULL; ++ break; ++ } ++ lastFile = item->file(); ++ ++ confStream = new QTextStream( confFile ); ++// (*confStream) << "# Generated by Opie Package Manager\n\n"; ++ } + +- // Only write out valid conf items +- if ( item->type() != OConfItem::NotDefined ) +- { +- QString confLine; +- QString name = item->name(); +- if ( !item->active() ) +- confLine = "#"; ++ QString confLine; ++ QString name = item->name(); ++ if ( !item->active() ) ++ confLine = "#"; + +- switch ( item->type() ) ++ switch ( item->type() ) ++ { ++ case OConfItem::Source : + { +- case OConfItem::Source : +- { +- if ( item->features().contains( "Compressed" ) ) +- confLine.append( "src/gz" ); +- else +- confLine.append( "src" ); +- } +- break; +- case OConfItem::Destination : confLine.append( "dest" ); break; +- case OConfItem::Option : confLine.append( "option" ); break; +- case OConfItem::Arch : confLine.append( "arch" ); break; +- case OConfItem::Other : +- { +- // For options w/type = Other, the mapping is as follows: +- // name = typeStr (e.g. "lists_dir") +- // value = value +- // features = name (from configuration file) +- confLine.append( item->name() ); +- name = item->features(); +- } +- break; +- default : break; +- }; ++ if ( item->features().contains( "Compressed" ) ) ++ confLine.append( "src/gz" ); ++ else ++ confLine.append( "src" ); ++ } ++ break; ++ case OConfItem::Destination : confLine.append( "dest" ); break; ++ case OConfItem::Option : confLine.append( "option" ); break; ++ case OConfItem::Arch : confLine.append( "arch" ); break; ++ case OConfItem::Other : ++ { ++ // For options w/type = Other, the mapping is as follows: ++ // name = typeStr (e.g. "lists_dir") ++ // value = value ++ // features = name (from configuration file) ++ confLine.append( item->name() ); ++ name = item->features(); ++ } ++ break; ++ default : break; ++ }; + +- confStream << confLine << " " << name << " " << item->value() << "\n"; +- } ++ (*confStream) << confLine << " " << name << " " << item->value() << "\n"; + } + +- confFile.close(); + } +- else +- { +- // Problem writing to /etc/ipkg.conf, exit before removing other conf files +- return; +- } +- +- // Delete /etc/ipkg/*.conf files (/etc/ipkg.conf should now have all settings +- QStringList confFiles; +- QDir confDir( IPKG_CONF_DIR ); +- if ( confDir.exists() ) +- { +- confDir.setNameFilter( "*.conf" ); +- confDir.setFilter( QDir::Files ); +- confFiles = confDir.entryList( "*.conf", QDir::Files ); +- +- QStringList::Iterator lastFile = confFiles.end(); +- for ( QStringList::Iterator it = confFiles.begin(); it != lastFile; ++it ) +- { +- // Create absolute file path if necessary +- QString absFile = (*it); +- if ( !absFile.startsWith( "/" ) ) +- absFile.prepend( QString( IPKG_CONF_DIR ) + "/" ); + +- // Delete file +- QFile::remove( absFile ); +- } ++ if ( confFile ) { ++ confFile->close(); ++ delete confStream; ++ delete confFile; + } + + // Reinitialize libipkg to pick up new configuration +@@ -638,7 +654,7 @@ + + // Add to list + if ( recognizedOption ) +- m_confInfo->append( new OConfItem( type, name, value, features, active ) ); ++ m_confInfo->append( new OConfItem( type, name, value, features, absFile, active ) ); + } + } + +--- packagemanager/oconfitem.cpp 2009-05-11 23:09:00.000000000 +0100 ++++ packagemanager/oconfitem.cpp 2009-05-11 23:09:02.000000000 +0100 +@@ -31,11 +31,12 @@ + #include "oconfitem.h" + + OConfItem::OConfItem( Type type, const QString &name, const QString &value, +- const QString &features, bool active ) ++ const QString &features, const QString &file, bool active ) + : m_type( type ) + , m_name( name ) + , m_value( value ) + , m_features( features ) ++ , m_file( file ) + , m_active( active ) + { + } +--- packagemanager/oconfitem.h 2009-05-11 23:08:43.000000000 +0100 ++++ packagemanager/oconfitem.h 2009-05-11 23:08:45.000000000 +0100 +@@ -41,18 +41,20 @@ + + OConfItem( Type type = NotDefined, const QString &name = QString::null, + const QString &value = QString::null, const QString &features = QString::null, +- bool active = true ); ++ const QString &file = QString::null, bool active = true ); + + Type type() { return m_type; } + const QString &name() { return m_name; } + const QString &value() { return m_value; } + const QString &features() { return m_features; } ++ const QString &file() { return m_file; } + bool active() { return m_active; } + + void setType( Type type ) { m_type = type; } + void setName( const QString &name ) { m_name = name; } + void setValue( const QString &value ) { m_value = value; } + void setFeatures( const QString &features ) { m_features = features; } ++ void setFile( const QString &file ) { m_file = file; } + void setActive( bool active ) { m_active = active; } + + private: +@@ -60,6 +62,7 @@ + QString m_name; // Name of item + QString m_value; // Value of item + QString m_features; // Comma-deliminated list of features this item supports ++ QString m_file; // File this item came from + bool m_active; // Indicates whether item is currently active + }; + +@@ -69,23 +72,32 @@ + + int compareItems( QCollection::Item item1, QCollection::Item item2 ) + { +- // Sort by OConfItem location then by type +- OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); +- OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); +- if ( type1 < type2 ) ++ // Sort by OConfItem file, name, then by type ++ QString file1 = reinterpret_cast<OConfItem*>(item1)->file(); ++ QString file2 = reinterpret_cast<OConfItem*>(item2)->file(); ++ if ( file1 < file2 ) + return -1; +- else if ( type1 == type2 ) ++ else if ( file1 == file2 ) + { +- QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); +- QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); +- if ( name1 < name2 ) ++ OConfItem::Type type1 = reinterpret_cast<OConfItem*>(item1)->type(); ++ OConfItem::Type type2 = reinterpret_cast<OConfItem*>(item2)->type(); ++ if ( type1 < type2 ) + return -1; +- else if ( name1 == name2 ) +- return 0; +- else /*if ( name1 > name2 )*/ ++ else if ( type1 == type2 ) ++ { ++ QString name1 = reinterpret_cast<OConfItem*>(item1)->name(); ++ QString name2 = reinterpret_cast<OConfItem*>(item2)->name(); ++ if ( name1 < name2 ) ++ return -1; ++ else if ( name1 == name2 ) ++ return 0; ++ else /*if ( name1 > name2 )*/ ++ return 1; ++ } ++ else /*if ( type1 > type2 )*/ + return 1; + } +- else /*if ( type1 > type2 )*/ ++ else /*if ( file1 > file2 )*/ + return 1; + } + }; +--- packagemanager/oipkgconfigdlg.cpp 2009-05-11 23:08:21.000000000 +0100 ++++ packagemanager/oipkgconfigdlg.cpp 2009-05-11 23:08:23.000000000 +0100 +@@ -99,7 +99,7 @@ + } + else + m_configs->append( new OConfItem( OConfItem::Option, "http_proxy", +- m_proxyHttpServer->text(), QString::null, ++ m_proxyHttpServer->text(), QString::null, QString::null, + m_proxyHttpActive->isChecked() ) ); + + confItem = m_ipkg->findConfItem( OConfItem::Option, "ftp_proxy" ); +@@ -110,7 +110,7 @@ + } + else + m_configs->append( new OConfItem( OConfItem::Option, "ftp_proxy", +- m_proxyFtpServer->text(), QString::null, ++ m_proxyFtpServer->text(), QString::null, QString::null, + m_proxyFtpActive->isChecked() ) ); + + confItem = m_ipkg->findConfItem( OConfItem::Option, "proxy_username" ); +@@ -472,6 +472,7 @@ + if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) + { + // Add to configuration option list ++ m_ipkg->defaultConfItemFile( server ); + m_configs->append( server ); + m_configs->sort(); + +@@ -532,6 +533,7 @@ + if ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ) + { + // Add to configuration option list ++ m_ipkg->defaultConfItemFile( dest ); + m_configs->append( dest ); + m_configs->sort(); + +--- packagemanager/oipkg.h 16 Jan 2006 15:07:35 -0000 1.9 ++++ packagemanager/oipkg.h 17 May 2009 21:26:55 -0000 +@@ -76,6 +76,7 @@ + + OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, + const QString &name = QString::null ); ++ void defaultConfItemFile( OConfItem *item ); + + bool executeCommand( OPackage::Command command = OPackage::NotDefined, + const QStringList ¶meters = QStringList(), diff --git a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb index 0b8f44981d..57c6ab5cfa 100644 --- a/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb +++ b/recipes/opie-packagemanager/opie-packagemanager_1.2.4.bb @@ -1,6 +1,13 @@ require ${PN}.inc +PR = "r1" + +DEPENDS = "opkg" + +EXTRA_QMAKEVARS_PRE += "LIBIPK_INC_DIR=${STAGING_INCDIR}/libopkg" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://split-config.patch;patch=1 \ + file://opkg.patch;patch=1" diff --git a/recipes/pointercal/files/topas910/pointercal b/recipes/pointercal/files/topas910/pointercal new file mode 100644 index 0000000000..e42ca8c46b --- /dev/null +++ b/recipes/pointercal/files/topas910/pointercal @@ -0,0 +1 @@ +-23229 -326 22774732 -242 -18721 17089984 65536 diff --git a/recipes/pointercal/pointercal_0.0.bb b/recipes/pointercal/pointercal_0.0.bb index 36aee53444..d292b893ed 100644 --- a/recipes/pointercal/pointercal_0.0.bb +++ b/recipes/pointercal/pointercal_0.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Touchscreen calibration data" SECTION = "base" -PR = "r13" +PR = "r14" SRC_URI = "file://pointercal" S = "${WORKDIR}" diff --git a/recipes/psplash/files/bug/psplash-default b/recipes/psplash/files/bug/psplash-default new file mode 100644 index 0000000000..16dad172a8 --- /dev/null +++ b/recipes/psplash/files/bug/psplash-default @@ -0,0 +1,4 @@ +# Parameters to pass to psplash +PARAMS="" + +export FBDEV="/dev/fb1" diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc index c1634de8c2..3477229d82 100644 --- a/recipes/psplash/psplash.inc +++ b/recipes/psplash/psplash.inc @@ -8,7 +8,7 @@ RPROVIDES_${PN} = "virtual/psplash" RCONFLICTS_${PN} = "exquisite" PV = "0.0+svnr${SRCREV}" -PR = "r21" +PR = "r22" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND diff --git a/recipes/psplash/psplash_svn.bb b/recipes/psplash/psplash_svn.bb index 8119ccf1e7..584822e254 100644 --- a/recipes/psplash/psplash_svn.bb +++ b/recipes/psplash/psplash_svn.bb @@ -3,8 +3,6 @@ require psplash-ua.inc ALTERNATIVE_PRIORITY = "10" -PR = "r20" - SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=psplash;proto=http \ file://psplash-hand-img.h \ file://psplash-bar-img.h \ diff --git a/recipes/python/python-2.6.1/07-export-grammer.patch b/recipes/python/python-2.6.1/07-export-grammer.patch new file mode 100644 index 0000000000..b7ec2bbc65 --- /dev/null +++ b/recipes/python/python-2.6.1/07-export-grammer.patch @@ -0,0 +1,10 @@ +--- Python-2.6.1.orig/Parser/printgrammar.c 2008-04-13 15:35:56.000000000 -0500 ++++ Python-2.6.1/Parser/printgrammar.c 2008-12-28 00:01:28.675633800 -0600 +@@ -16,6 +16,7 @@ + fprintf(fp, "/* Generated by Parser/pgen */\n\n"); + fprintf(fp, "#include \"pgenheaders.h\"\n"); + fprintf(fp, "#include \"grammar.h\"\n"); ++ fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n"); + printdfas(g, fp); + printlabels(g, fp); + fprintf(fp, "grammar _PyParser_Grammar = {\n"); diff --git a/recipes/python/python_2.6.1.bb b/recipes/python/python_2.6.1.bb index e50ca43aab..8ca51ae3bf 100644 --- a/recipes/python/python_2.6.1.bb +++ b/recipes/python/python_2.6.1.bb @@ -12,6 +12,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch;patch=1 \ file://05-enable-ctypes-cross-build.patch;patch=1 \ file://06-libffi-enable-default-mips.patch;patch=1 \ + file://07-export-grammer.patch;patch=1 \ file://99-ignore-optimization-flag.patch;patch=1 \ \ # not yet pushed forward diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb index 081c2e8aff..c40939fd3b 100644 --- a/recipes/transmission/transmission_1.40.bb +++ b/recipes/transmission/transmission_1.40.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -17,6 +17,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } +# No need for online check, since update-rc.d will prepend it to here pkg_postinst_${PN}() { grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission @@ -25,7 +26,6 @@ chown transmission:transmission /home/transmission/.config } pkg_postrm_${PN}() { -#!/bin/sh delgroup transmission deluser transmission } diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb index 1692147fcf..e898953dff 100644 --- a/recipes/transmission/transmission_1.61.bb +++ b/recipes/transmission/transmission_1.61.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r3" +PR = "r4" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -17,6 +17,9 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } +FILES_${PN} += "${datadir}/icons" + +# No need for online check, since update-rc.d will prepend it to here pkg_postinst_${PN}() { grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission @@ -25,7 +28,6 @@ chown transmission:transmission /home/transmission/.config } pkg_postrm_${PN}() { -#!/bin/sh delgroup transmission deluser transmission } diff --git a/recipes/udev/udev-141/akita/default b/recipes/udev/udev-141/akita/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/akita/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/c7x0/default b/recipes/udev/udev-141/c7x0/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/c7x0/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/default b/recipes/udev/udev-141/default new file mode 100644 index 0000000000..5c4937a9a0 --- /dev/null +++ b/recipes/udev/udev-141/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init index 9e11f08989..efe44708ca 100644 --- a/recipes/udev/udev-141/init +++ b/recipes/udev/udev-141/init @@ -14,6 +14,7 @@ export TZ=/etc/localtime [ -d /sys/class ] || exit 1 [ -r /proc/mounts ] || exit 1 [ -x /sbin/udevd ] || exit 1 +[ -f /etc/default/udev ] && . /etc/default/udev [ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf kill_udevd() { @@ -34,9 +35,18 @@ LANG=C awk "\$2 == \"/dev\" && \$4 == \"tmpfs\" { exit 1 }" /proc/mounts && { mkdir -m 0755 /dev/shm } -if [ -e /etc/dev.tar ]; then - (cd /; tar xf /etc/dev.tar) - not_first_boot=1 +if [ "$DEVCACHE" != "" ]; then + # Invalidate udev cache if the kernel or its bootargs/cmdline have changed + [ -x /bin/uname ] && /bin/uname -mrspv > /tmp/uname || touch /tmp/uname + [ -r /proc/cmdline ] && cat /proc/cmdline > /tmp/cmdline || touch /tmp/cmdline + [ -r /proc/atags ] && cat /proc/atags > /tmp/atags || touch /tmp/atags + if [ -e $DEVCACHE ] && \ + cmp -s /tmp/uname /etc/udev/saved.uname && \ + cmp -s /tmp/cmdline /etc/udev/saved.cmdline && \ + cmp -s /tmp/atags /etc/udev/saved.atags; then + (cd /; tar xf $DEVCACHE) + not_first_boot=1 + fi fi # make_extra_nodes @@ -50,10 +60,21 @@ kill_udevd > "/dev/null" 2>&1 if [ "$not_first_boot" != "" ];then /sbin/udevadm trigger --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux --subsystem-nomatch=platform (/sbin/udevadm settle --timeout=3; /sbin/udevadm control env STARTUP=)& + if [ "$DEVCACHE" != "" ]; then + rm -f /tmp/uname + rm -f /tmp/cmdline + rm -f /tmp/atags + fi else /sbin/udevadm trigger /sbin/udevadm settle - (cd /; tar cf /etc/dev.tar dev) + if [ "$DEVCACHE" != "" ]; then + echo -n " and populating dev cache" + (cd /; tar cf $DEVCACHE dev) + mv /tmp/uname /etc/udev/saved.uname + mv /tmp/cmdline /etc/udev/saved.cmdline + mv /tmp/atags /etc/udev/saved.atags + fi fi echo diff --git a/recipes/udev/udev-141/local.rules b/recipes/udev/udev-141/local.rules index a4866923fd..4e80a71d80 100644 --- a/recipes/udev/udev-141/local.rules +++ b/recipes/udev/udev-141/local.rules @@ -24,6 +24,9 @@ SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" # The first rtc device is symlinked to /dev/rtc KERNEL=="rtc0", SYMLINK+="rtc" +#The first framebuffer is symlinked to /dev/fb +KERNEL=="fb0", SYMLINK+="fb" + # Try and modprobe for drivers for new hardware ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" diff --git a/recipes/udev/udev-141/spitz/default b/recipes/udev/udev-141/spitz/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/spitz/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev-141/tosa/default b/recipes/udev/udev-141/tosa/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/tosa/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index 2368cb9880..1482601bf9 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -3,10 +3,10 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." LICENSE = "GPL" -# Untested, fails to create shared libs +# Untested DEFAULT_PREFERENCE = "-1" -PR = "r1" +PR = "r4" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ @@ -20,6 +20,7 @@ SRC_URI += " \ file://mount.sh \ file://network.sh \ file://local.rules \ + file://default \ file://init" SRC_URI_append_h2200 = " file://50-hostap_cs.rules " @@ -27,6 +28,13 @@ PACKAGE_ARCH_h2200 = "h2200" inherit update-rc.d autotools_stage +# Put stuff in /lib and /sbin +export sbindir="${base_sbindir}" +export exec_prefix="" +EXTRA_OECONF += " --with-udev-prefix= \ + --with-libdir-name=${base_libdir} \ +" + INITSCRIPT_NAME = "udev" INITSCRIPT_PARAMS = "start 03 S ." @@ -40,7 +48,7 @@ RPROVIDES_${PN} = "hotplug" FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" -FILES_${PN} += "${base_libdir}/udev/*" +FILES_${PN} += "${libdir}/udev/* ${base_libdir}/udev/*" FILES_${PN}-dbg += "${base_libdir}/udev/.debug" do_install () { @@ -50,6 +58,9 @@ do_install () { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev + install -d ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ @@ -62,12 +73,14 @@ do_install () { install -m 0644 ${WORKDIR}/devfs-udev.rules ${D}${sysconfdir}/udev/rules.d/devfs-udev.rules fi + touch ${D}${sysconfdir}/udev/saved.uname + touch ${D}${sysconfdir}/udev/saved.cmdline + touch ${D}${sysconfdir}/udev/saved.atags + install -d ${D}${sysconfdir}/udev/scripts/ install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts - - install -d ${D}${base_libdir}/udev/ } do_install_append_h2200() { diff --git a/recipes/util-linux-ng/files/fix-make-c.patch b/recipes/util-linux-ng/files/fix-make-c.patch new file mode 100644 index 0000000000..bf1082e85c --- /dev/null +++ b/recipes/util-linux-ng/files/fix-make-c.patch @@ -0,0 +1,41 @@ +From: Karel Zak <kzak@redhat.com> +Date: Mon, 11 May 2009 09:49:00 +0000 (+0200) +Subject: build-sys: fix "make -C" bug +X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=2ef7d41e6bbb7c842c06e911ffc562335a467b5d + +build-sys: fix "make -C" bug + +Running: + +./configure --with-fsprobe=builtin +make -C mount mount + +causes the following error: + +gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -include ../config.h +-I../include -DLOCALEDIR=\"/home/matthew/util-linux-ng/share/locale\" +-fsigned-char -I../libs/blkid/src -g -O2 -MT mount-setproctitle.o +-MD -MP -MF .deps/mount-setproctitle.Tpo -c -o mount-setproctitle.o +`test -f '../lib/setproctitle.c' || echo './'`../lib/setproctitle.c mv +-f .deps/mount-setproctitle.Tpo .deps/mount-setproctitle.Po +make -C +make: option requires an argument -- 'C' +Usage: make [options] [target] ... +... + +Reported-by: Matthew Burgess <matthew@linuxfromscratch.org> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + +diff --git a/config/include-Makefile.am b/config/include-Makefile.am +index b42a0c3..d5da619 100644 +--- a/config/include-Makefile.am ++++ b/config/include-Makefile.am +@@ -17,6 +17,7 @@ dist_noinst_DATA = $(dist_man_MANS) + # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) + # + ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src ++ul_libblkid_builddir = $(top_builddir)/libs/blkid/src + ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la + + $(ul_libblkid_la): diff --git a/recipes/util-linux-ng/files/optional-uuid.patch b/recipes/util-linux-ng/files/optional-uuid.patch new file mode 100644 index 0000000000..2d0ea43cd2 --- /dev/null +++ b/recipes/util-linux-ng/files/optional-uuid.patch @@ -0,0 +1,55 @@ +From: Karel Zak <kzak@redhat.com> +Date: Tue, 12 May 2009 19:22:19 +0000 (+0200) +Subject: blkid: make libuuid optional +X-Git-Url: http://git.kernel.org/?p=utils%2Futil-linux-ng%2Futil-linux-ng.git;a=commitdiff_plain;h=cdd17c7a73cab10a34bf80616225b8215ac4e2ed + +blkid: make libuuid optional + +read.c:28:23: error: uuid/uuid.h: No such file or directory +make[3]: *** [read.lo] Error 1 +make[3]: *** Waiting for unfinished jobs.... + +Reported-by: Olaf <mailinglists@ban-solms.de> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + +diff --git a/libs/blkid/src/config.c b/libs/blkid/src/config.c +index 2e59218..9091736 100644 +--- a/libs/blkid/src/config.c ++++ b/libs/blkid/src/config.c +@@ -24,9 +24,6 @@ + #include <errno.h> + #endif + #include <stdint.h> +-#ifdef HAVE_LIBUUID +-#include <uuid/uuid.h> +-#endif + #include <stdarg.h> + + #include "blkdev.h" +diff --git a/libs/blkid/src/evaluate.c b/libs/blkid/src/evaluate.c +index a9c9fba..f0ae126 100644 +--- a/libs/blkid/src/evaluate.c ++++ b/libs/blkid/src/evaluate.c +@@ -27,9 +27,6 @@ + #include <errno.h> + #endif + #include <stdint.h> +-#ifdef HAVE_LIBUUID +-#include <uuid/uuid.h> +-#endif + #include <stdarg.h> + + #include "pathnames.h" +diff --git a/libs/blkid/src/read.c b/libs/blkid/src/read.c +index 4163874..b5e9cd0 100644 +--- a/libs/blkid/src/read.c ++++ b/libs/blkid/src/read.c +@@ -25,7 +25,6 @@ + #endif + + #include "blkidP.h" +-#include "uuid/uuid.h" + + #ifdef HAVE_STRTOULL + #define STRTOULL strtoull /* defined in stdlib.h if you try hard enough */ diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 01e769eb6a..45fd1a6048 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,9 +1,10 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "udev zlib ncurses e2fsprogs-libs virtual/libintl" +DEPENDS = "udev zlib ncurses virtual/libintl" -inherit autotools +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" DEFAULT_PREFERENCE = "-1" @@ -13,8 +14,10 @@ RC ?= "" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2" PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile " +PACKAGES_DYNAMIC = "libblkid*" FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" +FILES_${PN} = "${bindir} ${sbindir} ${base_bindir} ${base_sbindir}" FILES_util-linux-ng-fdisk = "/sbin/fdisk.${PN}" FILES_util-linux-ng-cfdisk = "/sbin/cfdisk" @@ -30,7 +33,8 @@ RDEPENDS_${PN} = "util-linux-ng-umount util-linux-ng-swaponoff util-linux-ng-los EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ --enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ ---enable-arch --enable-init" +--enable-arch --enable-init --enable-partx --enable-schedutils \ +--with-fsprobe=builtin" S = "${WORKDIR}/util-linux-ng-${PV}${RC}" @@ -118,6 +122,16 @@ do_install () { ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt } +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) +} + + pkg_postinst_${PN} () { update-alternatives --install ${base_bindir}/dmesg dmesg dmesg.${PN} 100 update-alternatives --install ${base_bindir}/kill kill kill.${PN} 100 diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb new file mode 100644 index 0000000000..c4971b1404 --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb @@ -0,0 +1,16 @@ +require util-linux-ng.inc + +PR = "r2" + +SRC_URI += "file://fix-make-c.patch;patch=1 \ + file://optional-uuid.patch;patch=1 \ +" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +LDFLAGS_append = " -luuid" +LDFLAGS_append_libc-uclibc = " -luuid -lintl" + +do_compile_prepend() { + sed -i /am__append_1/d ${S}/libs/blkid/src/Makefile +} diff --git a/recipes/xmms-embedded/xmms-embedded_20040327.bb b/recipes/xmms-embedded/xmms-embedded_20040327.bb index a8b24e709a..48c543948c 100644 --- a/recipes/xmms-embedded/xmms-embedded_20040327.bb +++ b/recipes/xmms-embedded/xmms-embedded_20040327.bb @@ -63,4 +63,4 @@ do_install() { done } -FILES-${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" +FILES_${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" diff --git a/recipes/xserver-common/files/89xdgautostart.sh b/recipes/xserver-common/files/89xdgautostart.sh new file mode 100644 index 0000000000..db7aa229d2 --- /dev/null +++ b/recipes/xserver-common/files/89xdgautostart.sh @@ -0,0 +1,7 @@ +XDGAUTOSTART=/etc/xdg/autostart +if [ -d $XDGAUTOSTART ]; then + for SCRIPT in $XDGAUTOSTART/*; do + CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` + $CMD & + done +fi
\ No newline at end of file diff --git a/recipes/xserver-common/xserver-common_1.24.bb b/recipes/xserver-common/xserver-common_1.24.bb index a30a37c893..27b4ba6a70 100644 --- a/recipes/xserver-common/xserver-common_1.24.bb +++ b/recipes/xserver-common/xserver-common_1.24.bb @@ -2,15 +2,18 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe -SRC_URI_append = " file://setDPI.sh " +SRC_URI_append = " file://setDPI.sh \ + file://89xdgautostart.sh \ +" do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" + install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xinit.d/89xdgautostart.sh" } diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/98xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/89xTs_Calibrate index 70786908b6..70786908b6 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common/98xTs_Calibrate +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/89xTs_Calibrate diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 33c0a401e4..1bc3b98794 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -9,7 +9,7 @@ SRC_URI = "\ file://Xserver \ file://Xsession \ \ - file://30xTs_Calibrate \ + file://89xTs_Calibrate \ file://60xXDefaults \ file://90xXWindowManager \ " @@ -22,7 +22,7 @@ etcFiles = "\ Xsession \ " sessionFiles = "\ - 30xTs_Calibrate \ + 89xTs_Calibrate \ 60xXDefaults \ 90xXWindowManager \ " |