diff options
37 files changed, 512 insertions, 38 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 9f243c8c9a..bea11305a7 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -219,7 +219,7 @@ def package_qa_check_rpath(file,name,d): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") #bb.note("%s -B -F%%r#F %s" % (scanelf,file)) - output = os.popen("%s -B -F%%r#F %s" % (scanelf,file)) + output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file)) txt = output.readline().split() #bb.note("???%s???" % bad_dir_test) for line in txt: diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index d6e58871d5..67761bd4be 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -9,15 +9,11 @@ do_compile() { } pkg_postinst_fonts() { -#!/bin/sh -set -e . /etc/profile ${sbindir}/update-qtfontdir } pkg_postrm_fonts() { -#!/bin/sh -set -e . /etc/profile ${sbindir}/update-qtfontdir -f } diff --git a/packages/apmd/apmd-3.2.2/unlinux.patch b/packages/apmd/apmd-3.2.2/unlinux.patch new file mode 100644 index 0000000000..f7eec6eb03 --- /dev/null +++ b/packages/apmd/apmd-3.2.2/unlinux.patch @@ -0,0 +1,12 @@ +--- apmd-3.2.2.orig/Makefile ++++ apmd-3.2.2/Makefile +@@ -43,8 +43,7 @@ + + CC=gcc + CFLAGS=-O -g +-XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ +- -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ ++XTRACFLAGS=-Wall -pipe -I. \ + -DVERSION=\"$(VERSION)\" \ + -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" + LDFLAGS= diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb index 4313115c91..5402e67632 100644 --- a/packages/apmd/apmd_3.2.2.bb +++ b/packages/apmd/apmd_3.2.2.bb @@ -9,6 +9,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ file://debian.patch;patch=1 \ file://workaround.patch;patch=1 \ file://zaurus24.patch;patch=1 \ + file://unlinux.patch;patch=1 \ file://init \ file://default \ file://apmd_proxy \ diff --git a/packages/icu/icu_3.6.bb b/packages/icu/icu_3.6.bb index 03abbaa958..d67d565aa1 100644 --- a/packages/icu/icu_3.6.bb +++ b/packages/icu/icu_3.6.bb @@ -4,10 +4,11 @@ PR = "r1" do_configure_append() { for i in */Makefile */*.inc */*/Makefile */*/*.inc ; do - sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i - sed -i -e 's:$(BINDIR)/::g' $i + sed -i -e 's:$(INVOKE) $(BINDIR)/:$(INVOKE) :g' $i + sed -i -e 's:$(BINDIR)/::g' $i done - sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc + sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc || true + sed -i -e 's:$(BINDIR)/::g' extra/uconv/pkgdata.inc.in || true } diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index f6d051b9be..c57c14333a 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,7 +1,7 @@ require ipkg-utils_${PV}.bb RDEPENDS = "" -PR = "r12" +PR = "r13" inherit native diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch index 998406f1bb..25eb2cce6f 100644 --- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch @@ -131,7 +131,7 @@ Index: ipkg-utils/arfile.py + tarf = tarfile.open("control.tar.gz", "r", tarStream) + #tarf.list() + -+ f2 = tarf.extractfile("./control") ++ f2 = tarf.extractfile("control") + print f2.read() Index: ipkg-utils/setup.py =================================================================== @@ -158,7 +158,7 @@ Index: ipkg-utils/ipkg.py class Version: """A class for holding parsed package version information.""" -@@ -131,78 +133,58 @@ class Package: +@@ -131,78 +133,61 @@ class Package: self.section = None self.filename_header = None self.file_list = [] @@ -232,7 +232,10 @@ Index: ipkg-utils/ipkg.py + tarStream = ar.open("control.tar.gz") + tarf = tarfile.open("control.tar.gz", "r", tarStream) + -+ control = tarf.extractfile("./control") ++ try: ++ control = tarf.extractfile("control") ++ except KeyError: ++ control = tarf.extractfile("./control") + self.read_control(control) control.close() - if self.isdeb: diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 6ffe6fe679..e8f52b65a4 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r14" +PR = "r15" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ diff --git a/packages/m4/m4_1.4.8.bb b/packages/m4/m4_1.4.8.bb index 90f817d1f3..77d8e822b0 100644 --- a/packages/m4/m4_1.4.8.bb +++ b/packages/m4/m4_1.4.8.bb @@ -4,8 +4,6 @@ LICENSE = "GPL" SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz" S = "${WORKDIR}/m4-${PV}" -DEFAULT_PREFERENCE = "-1" - inherit autotools EXTRA_OEMAKE += "'infodir=${infodir}'" diff --git a/packages/mediatomb/mediatomb_0.9.1.bb b/packages/mediatomb/mediatomb_0.9.1.bb new file mode 100644 index 0000000000..f3ea9f54dd --- /dev/null +++ b/packages/mediatomb/mediatomb_0.9.1.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "MediaTomb - UPnP AV MediaServer for Linux" +HOMEPAGE = "http://mediatomb.cc/" +LICENSE = "GPLv2" +DEPENDS = "sqlite3 libexif js zlib file id3lib" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mediatomb/mediatomb-${PV}.tar.gz" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-mysql \ + --disable-rpl-malloc \ + --enable-sqlite3 \ + --enable-libjs \ + --enable-libmagic \ + --enable-id3lib \ + --enable-libexif \ + --disable-largefile \ + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-id3lib-h=${STAGING_INCDIR} \ + --with-id3lib-libs=${STAGING_LIBDIR}" diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie index 63eeb7b47d..1aa5fdf0b2 100755 --- a/packages/opie-init/opie-init/opie +++ b/packages/opie-init/opie-init/opie @@ -53,17 +53,15 @@ case $1 in $OPIEDIR/bin/opie-login -terminal 3 else $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh fi echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 + ( + test -x /usr/bin/ssh-agent && eval $(/usr/bin/ssh-agent -s) && echo $SSH_AGENT_PID>/var/run/opie-ssh-agent.pid ; + $OPIEDIR/bin/qpe -terminal 3 + ) echo -n >/var/log/opie-qss.log test -x $OPIEDIR/bin/qpe && { for attempt in 0 1 2 3 4 5 6 7 8 9 a b c d e f ; do sleep 1 @@ -83,6 +81,7 @@ case $1 in killall qpe 2>/dev/null killall opie-login 2>/dev/null killall quicklauncher 2>/dev/null + test -r /var/run/opie-ssh-agent.pid && kill $(cat /var/run/opie-ssh-agent.pid) 2>/dev/null true ;; diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb index bc1a4bc4e6..d54813eb7b 100644 --- a/packages/opie-init/opie-init_1.2.2.bb +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "file://opie-reorgfiles \ file://opie \ diff --git a/packages/perl/libcompress-zlib-perl_1.42.bb b/packages/perl/libcompress-zlib-perl_1.42.bb index f30692f576..3447db0a5a 100644 --- a/packages/perl/libcompress-zlib-perl_1.42.bb +++ b/packages/perl/libcompress-zlib-perl_1.42.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Compress::Zlib - Interface to zlib compression library" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r7" +PR = "r8" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/Compress-Zlib-${PV}.tar.gz" diff --git a/packages/perl/libdigest-sha1-perl_2.11.bb b/packages/perl/libdigest-sha1-perl_2.11.bb index fa9f2bcbcc..c851ec87c0 100644 --- a/packages/perl/libdigest-sha1-perl_2.11.bb +++ b/packages/perl/libdigest-sha1-perl_2.11.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Digest::SHA1 - Perl interface to the SHA-1 algorithm" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r11" +PR = "r12" SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-SHA1-${PV}.tar.gz" diff --git a/packages/perl/libextutils-depends-perl-native_0.205.bb b/packages/perl/libextutils-depends-perl-native_0.205.bb new file mode 100644 index 0000000000..e0216cbfb5 --- /dev/null +++ b/packages/perl/libextutils-depends-perl-native_0.205.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libextutils-depends-perl_${PV}.bb diff --git a/packages/perl/libextutils-depends-perl_0.205.bb b/packages/perl/libextutils-depends-perl_0.205.bb new file mode 100644 index 0000000000..274550dbd3 --- /dev/null +++ b/packages/perl/libextutils-depends-perl_0.205.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ExtUtils::Depends - Easily build XS extensions that depend on XS extensions" +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r2" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-Depends-${PV}.tar.gz" + +S = "${WORKDIR}/ExtUtils-Depends-${PV}" + +inherit cpan diff --git a/packages/perl/libextutils-pkgconfig-perl-native_1.07.bb b/packages/perl/libextutils-pkgconfig-perl-native_1.07.bb new file mode 100644 index 0000000000..b5cd092dbd --- /dev/null +++ b/packages/perl/libextutils-pkgconfig-perl-native_1.07.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libextutils-pkgconfig-perl_${PV}.bb diff --git a/packages/perl/libextutils-pkgconfig-perl_1.07.bb b/packages/perl/libextutils-pkgconfig-perl_1.07.bb new file mode 100644 index 0000000000..e0b807f374 --- /dev/null +++ b/packages/perl/libextutils-pkgconfig-perl_1.07.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "ExtUtils::PkgConfig - simplistic interface to pkg-config" +SECTION = "libs" +LICENSE = "Artistic|GPL" +PR = "r3" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/R/RM/RMCFARLA/Gtk2-Perl/ExtUtils-PkgConfig-${PV}.tar.gz" + +S = "${WORKDIR}/ExtUtils-PkgConfig-${PV}" + +inherit cpan diff --git a/packages/perl/libhtml-mason-perl_1.35.bb b/packages/perl/libhtml-mason-perl_1.35.bb new file mode 100644 index 0000000000..7b6ede5d49 --- /dev/null +++ b/packages/perl/libhtml-mason-perl_1.35.bb @@ -0,0 +1,35 @@ +SECTION = "libs" +LICENSE = "Artistic|GPL" +DEPENDS = "libexception-class-perl-native libparams-validate-perl-native \ + libcache-cache-perl-native libclass-container-perl-native" +RDEPENDS_${PN} = "libexception-class-perl libparams-validate-perl \ + libcache-cache-perl libclass-container-perl perl-module-strict \ + perl-module-warnings perl-module-file-basename perl-module-file-path \ + perl-module-file-spec perl-module-file-spec-unix perl-module-file-temp \ + perl-module-carp-heavy perl-module-io-handle perl-module-io \ + perl-module-exporter-heavy perl-module-cwd perl-module-scalar-util \ + perl-module-list-util perl-module-bytes perl-module-file-glob \ + perl-module-data-dumper" +PR = "r0" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/HTML-Mason-${PV}.tar.gz" + +S = "${WORKDIR}/HTML-Mason-${PV}" + +inherit cpan_build + +do_install_append () { + # Fix up paths to the perl interpreter + for i in ${D}${bindir}/*.pl; do + sed -i -e "s#${STAGING_BINDIR}/perl#${bindir}/perl#g" $i + done + + # Install the html documentation and example files + install -m 0755 -d ${D}${docdir}/${PN}/html \ + ${D}${docdir}/${PN}/examples/samples \ + ${D}${docdir}/${PN}/examples/eg + cp -pRP ${S}/htdocs ${D}${docdir}/${PN}/html + cp -pRP ${S}/eg ${D}${docdir}/${PN}/examples/eg + cp -pRP ${S}/samples ${D}${docdir}/${PN}/examples/samples +} + diff --git a/packages/perl/libipc-sharelite-perl_0.09.bb b/packages/perl/libipc-sharelite-perl_0.09.bb index d56f0a99d4..5c2f7fcae2 100644 --- a/packages/perl/libipc-sharelite-perl_0.09.bb +++ b/packages/perl/libipc-sharelite-perl_0.09.bb @@ -1,7 +1,7 @@ DESCRIPTION = "IPC::ShareLite - Light-weight interface to shared memory" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r11" +PR = "r12" SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MAURICE/IPC-ShareLite-${PV}.tar.gz" diff --git a/packages/perl/liblocale-gettext-perl_1.05.bb b/packages/perl/liblocale-gettext-perl_1.05.bb index f9490c0c41..621243cd8f 100644 --- a/packages/perl/liblocale-gettext-perl_1.05.bb +++ b/packages/perl/liblocale-gettext-perl_1.05.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Locale::gettext - message handling functions" SECTION = "libs" LICENSE = "Artistic|GPL" DEPENDS = "virtual/libintl" -PR = "r7" +PR = "r8" SRC_URI = "http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/gettext-${PV}.tar.gz" diff --git a/packages/perl/libparams-validate-perl_0.86.bb b/packages/perl/libparams-validate-perl_0.86.bb index f3a11d2d60..db1a7bd812 100644 --- a/packages/perl/libparams-validate-perl_0.86.bb +++ b/packages/perl/libparams-validate-perl_0.86.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Params::Validate - Validate method/function parameters" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r11" +PR = "r12" SRC_URI = "http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-${PV}.tar.gz" diff --git a/packages/perl/libversion-perl_0.6701.bb b/packages/perl/libversion-perl_0.6701.bb index 1081d98135..246a663d10 100644 --- a/packages/perl/libversion-perl_0.6701.bb +++ b/packages/perl/libversion-perl_0.6701.bb @@ -1,7 +1,7 @@ DESCRIPTION = "version - Perl extension for Version Objects" SECTION = "libs" LICENSE = "Artistic|GPL" -PR = "r6" +PR = "r7" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-${PV}.tar.gz" diff --git a/packages/perl/libxml-parser-perl_2.34.bb b/packages/perl/libxml-parser-perl_2.34.bb index b1676bb2fd..52adf2b2bf 100644 --- a/packages/perl/libxml-parser-perl_2.34.bb +++ b/packages/perl/libxml-parser-perl_2.34.bb @@ -1,7 +1,7 @@ SECTION = "libs" LICENSE = "Artistic" DEPENDS += "expat-native" -PR = "r7" +PR = "r8" SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" diff --git a/packages/perl/perl-5.8.8/generate-sh.patch b/packages/perl/perl-5.8.8/generate-sh.patch index 4c2b0bd752..50ce00b42f 100644 --- a/packages/perl/perl-5.8.8/generate-sh.patch +++ b/packages/perl/perl-5.8.8/generate-sh.patch @@ -1,16 +1,46 @@ Use the ld flags from the supplied configuration file. For sh we need the flags that specify to build PIC code so that the shared libraries work. ---- perl-5.8.7/Cross/generate_config_sh~ 2006-09-25 16:34:09.000000000 +1000 -+++ perl-5.8.7/Cross/generate_config_sh 2006-09-25 16:34:09.000000000 +1000 -@@ -19,8 +19,8 @@ +Index: perl-5.8.8/Cross/generate_config_sh +=================================================================== +--- perl-5.8.8.orig/Cross/generate_config_sh 2003-09-05 18:31:08.000000000 +1000 ++++ perl-5.8.8/Cross/generate_config_sh 2007-05-30 09:12:50.000000000 +1000 +@@ -19,10 +19,10 @@ $callbacks->{'ar'} = [\&simple_process, ["AR", "arm-linux-ar"]]; $callbacks->{'archname'} = [\&simple_process, ["SYS", "armv4l-linux"]]; $callbacks->{'cc'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; -$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; -$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; +-$callbacks->{'ccflags'} = [\&simple_process, ["CFLAGS", "-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; +-$callbacks->{'ccflags_uselargefiles'} = [\&simple_process, ["CFLAGS", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; +#$callbacks->{'cccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; +#$callbacks->{'ccdlflags'} = [\&simple_process, ["CFLAGS", ""]]; - $callbacks->{'ccflags'} = [\&simple_process, ["CFLAGS", "-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; - $callbacks->{'ccflags_uselargefiles'} = [\&simple_process, ["CFLAGS", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; ++$callbacks->{'ccflags'} = [\&simple_process_insert, ["CFLAGS", "-fno-strict-aliasing -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; ++$callbacks->{'ccflags_uselargefiles'} = [\&simple_process_insert, ["CFLAGS", "-D_GNU_SOURCE -DTHREADS_HAVE_PIDS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"]]; $callbacks->{'ccname'} = [\&simple_process, ["CC", "arm-linux-gcc"]]; + $callbacks->{'cpp'} = [\&simple_process, ["CCP", "arm-linux-cpp"]]; + $callbacks->{'cppflags'} = [\&simple_process, ["CCPFLAGS", "-fno-strict-aliasing"]]; +@@ -105,6 +105,23 @@ + + } + ++# Insert env var into the variables value ++sub simple_process_insert { ++ my $key = shift; ++ my $value = shift; ++ my $envvar = $callbacks->{$key}->[1][0]; ++ ++ if ($ENV{$envvar}) { ++ # Strip quotes from value ++ $value =~ s/^\'//; ++ $value =~ s/\'$//; ++ # Remove -I/usr/local/... from the value ++ $value =~ s#\W-I/usr/local/\w+\W##g; ++ # Prepend env var (OE setting) to value ++ print("$key=\'$ENV{$envvar} $value\'\n"); ++ } ++} ++ + sub library_munge { + my $key = shift; + my $value = shift; diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index c8e7afebc7..3dfe17cad8 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r16" +PR = "r17" # Major part of version PVM = "5.8" diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb index c0bfdcc5be..eaebe2087f 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3.bb @@ -4,7 +4,7 @@ PR = "r5" PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc" DESCRIPTION = "Prismstumbler wireless LAN scanner" LICENSE = "GPL" -DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib" +DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib libxpm" RDEPENDS = "wireless-tools" SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \ diff --git a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro b/packages/uclibc/uclibc-0.9.29/uClibc.distro index b326ff03b5..b326ff03b5 100644 --- a/packages/uclibc/uclibc-0.9.29/angstrom/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.29/uClibc.distro diff --git a/packages/webkit/.mtn2git_empty b/packages/webkit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/webkit/.mtn2git_empty diff --git a/packages/webkit/webkit/.mtn2git_empty b/packages/webkit/webkit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/webkit/webkit/.mtn2git_empty diff --git a/packages/webkit/webkit/Makefile b/packages/webkit/webkit/Makefile new file mode 100644 index 0000000000..89344f7a58 --- /dev/null +++ b/packages/webkit/webkit/Makefile @@ -0,0 +1,22 @@ +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools + +all: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +debug d development dev develop: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +release r deployment dep deploy: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +universal u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +clean: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/webkit/Makefile.shared new file mode 100644 index 0000000000..df3389ca3b --- /dev/null +++ b/packages/webkit/webkit/Makefile.shared @@ -0,0 +1,20 @@ +XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) + +all: + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +debug d development dev develop: force + ../WebKitTools/Scripts/set-webkit-configuration --debug + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +release r deployment dep deploy: force + ../WebKitTools/Scripts/set-webkit-configuration --release + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +universal u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +clean: + ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +force: ; diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/webkit/WebKit.pri new file mode 100644 index 0000000000..168e5558b6 --- /dev/null +++ b/packages/webkit/webkit/WebKit.pri @@ -0,0 +1,55 @@ +# Include file to make it easy to include WebKit into Qt projects + + +isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release + +!gdk-port:CONFIG += qt-port +qt-port:DEFINES += BUILDING_QT__=1 +qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt +gdk-port:CONFIG += link_pkgconfig +gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl +gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__ +gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) +gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + +DEFINES += USE_SYSTEM_MALLOC +CONFIG(release) { + DEFINES += NDEBUG +} + +BASE_DIR = $$PWD +qt-port:INCLUDEPATH += \ + $$PWD/WebKitQt/Api +gdk-port:INCLUDEPATH += \ + $$BASE_DIR/WebCore/platform/gdk \ + $$BASE_DIR/WebCore/platform/network/gdk \ + $$BASE_DIR/WebCore/platform/graphics/cairo \ + $$BASE_DIR/WebCore/loader/gdk \ + $$BASE_DIR/WebCore/page/gdk +INCLUDEPATH += \ + $$BASE_DIR/JavaScriptCore/ \ + $$BASE_DIR/JavaScriptCore/kjs \ + $$BASE_DIR/JavaScriptCore/bindings \ + $$BASE_DIR/JavaScriptCore/bindings/c \ + $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/WebCore \ + $$BASE_DIR/WebCore/ForwardingHeaders \ + $$BASE_DIR/WebCore/platform \ + $$BASE_DIR/WebCore/platform/network \ + $$BASE_DIR/WebCore/platform/graphics \ + $$BASE_DIR/WebCore/loader \ + $$BASE_DIR/WebCore/page \ + $$BASE_DIR/WebCore/css \ + $$BASE_DIR/WebCore/dom \ + $$BASE_DIR/WebCore/bridge \ + $$BASE_DIR/WebCore/editing \ + $$BASE_DIR/WebCore/rendering \ + $$BASE_DIR/WebCore/history \ + $$BASE_DIR/WebCore/xml \ + $$BASE_DIR/WebCore/html + + +macx { + INCLUDEPATH += /usr/include/libxml2 + LIBS += -lxml2 -lxslt +} diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/webkit/WebKit.pro new file mode 100644 index 0000000000..eae6a46180 --- /dev/null +++ b/packages/webkit/webkit/WebKit.pro @@ -0,0 +1,12 @@ +TEMPLATE = subdirs +CONFIG += ordered +!gdk-port:CONFIG += qt-port +SUBDIRS = \ + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port:SUBDIRS += \ + WebKitQt/QtLauncher \ + WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree.pro +gdk-port:SUBDIRS += \ + WebKitTools/GdkLauncher diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit_svn.bb new file mode 100644 index 0000000000..7e221f4113 --- /dev/null +++ b/packages/webkit/webkit_svn.bb @@ -0,0 +1,35 @@ +DEPENDS = "flex-native icu uicmoc4-native qmake2-native libxml2 sqlite3 cairo gtk+" + +# Yes, this is wrong... +PV = "0.0+svn${SRCDATE}" + +inherit qmake + +SRC_URI = "\ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ +# svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitQt;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ + file://Makefile \ + file://Makefile.shared \ + file://WebKit.pri \ + file://WebKit.pro \ +" + +S = "${WORKDIR}/" + + +do_configure() { + qmake2 CONFIG+=gdk-port CONFIG-=qt CONFIG-=release CONFIG+=debug + mkdir -p WebKitBuilds/Debug + cd WebKitBuilds/Debug + PWD=`pwd` qmake2 -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gdk-port $PWD/../../WebKit.pro +} + +do_compile() { + cd ${S}/WebKitBuilds/Debug + oe_runmake +} diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/fbcompositesrc8888revnpx0565.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/fbcompositesrc8888revnpx0565.patch new file mode 100644 index 0000000000..e128123419 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/fbcompositesrc8888revnpx0565.patch @@ -0,0 +1,194 @@ +Hello all, + +The attached patch provides a fast path for the case of performing +a8b8g8r8 non-premultiplied (aka the GdkPixbuf format) OVER r5g6b5 via +a new function called fbCompositeSrc_8888RevNPx0565. Basically, it's +just an adaptation of the previous work I talked about here: + +http://lists.freedesktop.org/archives/xorg/2007-April/023763.html + +On my Nokia N800, I get a 3.4x speedup when running this little gdk +benchmark program: + +http://amelang.net/composite_pixbuf.c + +The source file is kinda large (4.5MB) due to an embedded GdkPixbuf. + +Dan Amelang +-------------- next part -------------- +From 63bdc0476c09669cabccffe4b35f8f56aff965a5 Mon Sep 17 00:00:00 2001 +From: Dan Amelang <dan at amelang.net> +Date: Mon, 30 Apr 2007 03:22:52 -0700 +Subject: [PATCH] Implement fbCompositeSrc_8888RevNPx0565 + +This provides a fast path for the common case of compositing GdkPixmaps +with r5g6b5 images. On a simple GDK benchmark application, I get a +3.4x increase in performance on the Nokia N800 (which currently is +running xserver 1.1.99.3). + +All of the optimizations used here are already explained in the following +post to the Xorg mailing list: + + http://lists.freedesktop.org/archives/xorg/2007-April/023763.html +--- + fb/fbpict.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 139 insertions(+), 0 deletions(-) + +diff --git a/fb/fbpict.c b/fb/fbpict.c +index a735967..3bd57fb 100644 +--- a/fb/fbpict.c ++++ b/fb/fbpict.c +@@ -781,6 +781,143 @@ fbCompositeSrc_8888x0565 (CARD8 op, + fbFinishAccess (pSrc->pDrawable); + } + ++ ++#define cvt8888Revto0565(s) ((((s) >> 19) & 0x001f) | \ ++ (((s) >> 5) & 0x07e0) | \ ++ (((s) << 8) & 0xf800)) ++ ++#define FbOverU_8888RevNPx565(s, d) \ ++ \ ++ /* Extract alpha */ \ ++ s_a = (s) >> 24; \ ++ \ ++ /* Extract r8g8b8 color channels */ \ ++ s_r = ( (s) & 0xff); \ ++ s_g = (((s) >> 8) & 0xff); \ ++ s_b = (((s) >> 16) & 0xff); \ ++ \ ++ /* Extract r5g6b5 color channels */ \ ++ d_r = ((d) >> 8) & 0xf8; \ ++ d_g = ((d) >> 3) & 0xfc; \ ++ d_b = ((d) << 3) & 0xf8; \ ++ \ ++ /* Use the higher bits of the channel to fill out the bottom */ \ ++ d_r |= (d_r >> 5); \ ++ d_g |= (d_g >> 6); \ ++ d_b |= (d_b >> 5); \ ++ \ ++ /* Blend */ \ ++ d_r = (s_r - d_r) * s_a + (d_r << 8); \ ++ d_g = (s_g - d_g) * s_a + (d_g << 8); \ ++ d_b = (s_b - d_b) * s_a + (d_b << 8); \ ++ \ ++ /* Pack result as r5g6b5 */ \ ++ (d) = (d_r & 0xf800) | ((d_g & 0xfc00) >> 5) | (d_b >> 11) ++ ++void ++fbCompositeSrc_8888RevNPx0565 (FbComposeData *params) ++{ ++ CARD16 *dstLine, *dst; ++ CARD32 *srcLine, *src; ++ FbStride dstStride, srcStride; ++ int w, h; ++ ++ fbComposeGetStart (params->src, params->xSrc, params->ySrc, CARD32, ++ srcStride, srcLine, 1); ++ fbComposeGetStart (params->dest, params->xDest, params->yDest, CARD16, ++ dstStride, dstLine, 1); ++ h = params->height; ++ ++ while (h--) ++ { ++ CARD32 s1, s2, s3, s4; ++ int d_r, d_g, d_b, s_r, s_g, s_b, s_a; ++ CARD32 *dst_2px_wide; ++ ++ src = srcLine; ++ srcLine += srcStride; ++ dst_2px_wide = (CARD32 *) dstLine; ++ dstLine += dstStride; ++ w = params->width - 4; ++ ++ while (w >= 0) ++ { ++ s1 = *src; ++ s2 = *(src + 1); ++ s3 = *(src + 2); ++ s4 = *(src + 3); ++ ++ w -= 4; ++ src += 4; ++ ++ /* Check if the next 4 pixels are opaque */ ++ if ((s1 & s2 & s3 & s4) > 0xfeffffff) ++ { ++ /* In this case, we just perform a SOURCE for all 4 pixels */ ++#if X_BYTE_ORDER == X_BIG_ENDIAN ++ *dst_2px_wide++ = (cvt8888Revto0565 (s1) << 16) | ++ cvt8888Revto0565 (s2); ++ *dst_2px_wide++ = (cvt8888Revto0565 (s3) << 16) | ++ cvt8888Revto0565 (s4); ++#else ++ *dst_2px_wide++ = cvt8888Revto0565 (s1) | ++ (cvt8888Revto0565 (s2) << 16); ++ *dst_2px_wide++ = cvt8888Revto0565 (s3) | ++ (cvt8888Revto0565 (s4) << 16); ++#endif ++ } ++ /* Next, check if the next 4 pixels have any alpha in them at all */ ++ else if ((s1 | s2 | s3 | s4) > 0x00ffffff) ++ { ++ /* In which case, we perform OVER on each one of them */ ++ CARD32 d1, d2, d3, d4; ++ ++#if X_BYTE_ORDER == X_BIG_ENDIAN ++ d1 = (*dst_2px_wide >> 16); ++ d2 = (*dst_2px_wide & 0xffff); ++ FbOverU_8888RevNPx565 (s1, d1); ++ FbOverU_8888RevNPx565 (s2, d2); ++ *dst_2px_wide++ = (d1 << 16) | d2; ++#else ++ d2 = (*dst_2px_wide >> 16); ++ d1 = (*dst_2px_wide & 0xffff); ++ FbOverU_8888RevNPx565 (s1, d1); ++ FbOverU_8888RevNPx565 (s2, d2); ++ *dst_2px_wide++ = d1 | (d2 << 16); ++#endif ++ ++#if X_BYTE_ORDER == X_BIG_ENDIAN ++ d3 = (*dst_2px_wide >> 16); ++ d4 = (*dst_2px_wide & 0xffff); ++ FbOverU_8888RevNPx565 (s3, d3); ++ FbOverU_8888RevNPx565 (s4, d4); ++ *dst_2px_wide++ = (d3 << 16) | d4; ++#else ++ d4 = (*dst_2px_wide >> 16); ++ d3 = (*dst_2px_wide & 0xffff); ++ FbOverU_8888RevNPx565 (s3, d3); ++ FbOverU_8888RevNPx565 (s4, d4); ++ *dst_2px_wide++ = d3 | (d4 << 16); ++#endif ++ } ++ else ++ { ++ /* Do nothing, since the source pixels are all transparent */ ++ dst_2px_wide += 2; ++ } ++ } ++ ++ /* Deal with left over pixels */ ++ for (dst = (CARD16 *) dst_2px_wide; w > -4; w--) ++ { ++ CARD32 d = *dst; ++ CARD32 s = *src++; ++ FbOverU_8888RevNPx565 (s, d); ++ *dst++ = d; ++ } ++ } ++} ++ + void + fbCompositeSrcAdd_8000x8000 (CARD8 op, + PicturePtr pSrc, +@@ -1669,7 +1806,9 @@ fbComposite (CARD8 op, + #ifdef USE_MMX + if (fbHaveMMX()) + func = fbCompositeSrc_8888RevNPx0565mmx; ++ else + #endif ++ func = fbCompositeSrc_8888RevNPx0565; + break; + default: + break; diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index 2ba1b09923..fb6bde07e8 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,14 +3,15 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r6" +PR = "r7" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://enable-xcalibrate.patch;patch=1 \ file://w100.patch;patch=1 \ file://w100-fix-offscreen-bmp.patch;patch=1 \ - " + file://fbcompositesrc8888revnpx0565.patch;patch=1 \ + " S = "${WORKDIR}/xorg-server-${PV}" |