diff options
38 files changed, 1701 insertions, 528 deletions
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index d1e19aa3e4..cbd82fa467 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -32,6 +32,8 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" +PREFERRED_VERSION_u-boot = "git" +EXTRA_IMAGEDEPENDS += "u-boot x-load" # and sdio MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" diff --git a/packages/espgs/espgs_8.15.3.bb b/packages/espgs/espgs_8.15.3.bb index 50f2ca2d36..13cfad6d12 100644 --- a/packages/espgs/espgs_8.15.3.bb +++ b/packages/espgs/espgs_8.15.3.bb @@ -2,31 +2,21 @@ DESCRIPTION = "ESP Ghostscript is an up-to-date GNU Ghostscript distribution \ including bug fixes, new drivers, and additional support for CUPS." HOMEPAGE = "http://www.cups.org/espgs/" SECTION = "libs" -DEPENDS = "jpeg zlib libpng fontconfig" +DEPENDS = "jpeg zlib libpng tiff fontconfig" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/${PV}/espgs-${PV}-source.tar.bz2" -S = "${WORKDIR}/espgs-${PV}" PARALLEL_MAKE = "" inherit autotools -PACKAGES += "espgs-examples espgs-resources" - -# I added the lib dir to the central package, since espgs complained of a missing file when run. -# If I find exactly which files are needed for operation, I'll just add those, and split the package. - -FILES_${PN} += "${datadir}/ghostscript/8.15/lib/*" -FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*" -FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*" -FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*" - -EXTRA_OECONF = "--with-drivers= \ - --disable-cups \ - --disable-gtk \ +EXTRA_OECONF = "--with-drivers=ALL \ + --enable-cups \ --without-ijs \ - --without-gimp-print \ + --disable-gtk \ + --without-gimp-print \ --without-x \ --without-omni" @@ -34,12 +24,32 @@ do_compile() { oe_runmake CCAUX="${BUILD_CC}" } + do_install () { oe_runmake 'prefix=${D}${prefix}' \ 'bindir=${D}${bindir}' \ 'datadir=${D}${datadir}' \ + 'cups_datadir=${D}${datadir}/cups' \ + 'cups_serverroot=${D}${sysconfdir}/cups' \ + 'cups_serverbin= ${D}${libdir}/cups' \ + 'CUPSSERVER=${cups_serverbin}' \ + 'CUPSCONFIG=${cups_serverroot}' \ + 'CUPSDATA=${cups_datadir}' \ + 'sysconfdir=${D}${sysconfdir}' \ 'gsdir=${D}${datadir}/ghostscript' \ 'gsdatadir=${D}${datadir}/ghostscript/8.15' \ 'mandir=${D}${mandir}' \ - 'docdir=${D}${datadir}/doc/espgs/' install + 'docdir=${D}${datadir}/doc/espgs/' install } + +PACKAGES += "espgs-examples espgs-resources" + +# I added the lib dir to the central package, since espgs complained of a missing file when run. +# If I find exactly which files are needed for operation, I'll just add those, and split the package. + +FILES_${PN} += "${datadir}/ghostscript/8.15/lib/* \ + ${libdir}/cups/filter/* \ + ${datadir}/cups/model/* \" +FILES_${PN}-doc += "${datadir}/ghostscript/8.15/doc/*" +FILES_${PN}-examples += "${datadir}/ghostscript/8.15/examples/*" +FILES_${PN}-resources += "${datadir}/ghostscript/8.15/Resource/*" diff --git a/packages/flac/flac-1.1.0/.mtn2git_empty b/packages/flac/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/flac/flac-1.1.0/.mtn2git_empty +++ b/packages/flac/files/.mtn2git_empty diff --git a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch b/packages/flac/files/disable-xmms-plugin.patch index e42fcbd84d..e42fcbd84d 100644 --- a/packages/flac/flac-1.1.0/disable-xmms-plugin.patch +++ b/packages/flac/files/disable-xmms-plugin.patch diff --git a/packages/flac/flac-1.1.0/xmms.m4 b/packages/flac/files/xmms.m4 index 6d1489bf19..6d1489bf19 100644 --- a/packages/flac/flac-1.1.0/xmms.m4 +++ b/packages/flac/files/xmms.m4 diff --git a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch b/packages/flac/flac-1.1.2/disable-xmms-plugin.patch deleted file mode 100644 index e42fcbd84d..0000000000 --- a/packages/flac/flac-1.1.2/disable-xmms-plugin.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- flac-1.1.0/src/Makefile.am.orig 2004-12-25 01:11:45.000000000 +0100 -+++ flac-1.1.0/src/Makefile.am 2004-12-25 01:12:10.000000000 +0100 -@@ -15,10 +15,6 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - --if FLaC__HAS_XMMS --XMMS_DIRS = plugin_xmms --endif -- - if FLaC__HAS_OGG - OGGFLAC_DIRS = libOggFLAC libOggFLAC++ - OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++ -@@ -33,7 +29,6 @@ - metaflac \ - monkeys_audio_utilities \ - plugin_common \ -- $(XMMS_DIRS) \ - plugin_winamp2 \ - plugin_winamp3 \ - test_grabbag \ diff --git a/packages/flac/flac-1.1.2/xmms.m4 b/packages/flac/flac-1.1.2/xmms.m4 deleted file mode 100644 index 6d1489bf19..0000000000 --- a/packages/flac/flac-1.1.2/xmms.m4 +++ /dev/null @@ -1,148 +0,0 @@ -# CFLAGS and library paths for XMMS -# written 15 December 1999 by Ben Gertzfield <che@debian.org> - -dnl Usage: -dnl AM_PATH_XMMS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl -dnl Example: -dnl AM_PATH_XMMS(0.9.5.1, , AC_MSG_ERROR([*** XMMS >= 0.9.5.1 not installed - please install first ***])) -dnl -dnl Defines XMMS_CFLAGS, XMMS_LIBS, XMMS_DATA_DIR, XMMS_PLUGIN_DIR, -dnl XMMS_VISUALIZATION_PLUGIN_DIR, XMMS_INPUT_PLUGIN_DIR, -dnl XMMS_OUTPUT_PLUGIN_DIR, XMMS_GENERAL_PLUGIN_DIR, XMMS_EFFECT_PLUGIN_DIR, -dnl and XMMS_VERSION for your plugin pleasure. -dnl - -dnl XMMS_TEST_VERSION(AVAILABLE-VERSION, NEEDED-VERSION [, ACTION-IF-OKAY [, ACTION-IF-NOT-OKAY]]) -AC_DEFUN(XMMS_TEST_VERSION, [ - -# Determine which version number is greater. Prints 2 to stdout if -# the second number is greater, 1 if the first number is greater, -# 0 if the numbers are equal. - -# Written 15 December 1999 by Ben Gertzfield <che@debian.org> -# Revised 15 December 1999 by Jim Monty <monty@primenet.com> - - AC_PROG_AWK - xmms_got_version=[` $AWK ' \ -BEGIN { \ - print vercmp(ARGV[1], ARGV[2]); \ -} \ - \ -function vercmp(ver1, ver2, ver1arr, ver2arr, \ - ver1len, ver2len, \ - ver1int, ver2int, len, i, p) { \ - \ - ver1len = split(ver1, ver1arr, /\./); \ - ver2len = split(ver2, ver2arr, /\./); \ - \ - len = ver1len > ver2len ? ver1len : ver2len; \ - \ - for (i = 1; i <= len; i++) { \ - p = 1000 ^ (len - i); \ - ver1int += ver1arr[i] * p; \ - ver2int += ver2arr[i] * p; \ - } \ - \ - if (ver1int < ver2int) \ - return 2; \ - else if (ver1int > ver2int) \ - return 1; \ - else \ - return 0; \ -}' $1 $2`] - - if test $xmms_got_version -eq 2; then # failure - ifelse([$4], , :, $4) - else # success! - ifelse([$3], , :, $3) - fi -]) - -AC_DEFUN(AM_PATH_XMMS, -[ -AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], - xmms_config_prefix="$withval", xmms_config_prefix="") -AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], - xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") - -if test x$xmms_config_exec_prefix != x; then - xmms_config_args="$xmms_config_args --exec-prefix=$xmms_config_exec_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_exec_prefix/bin/xmms-config - fi -fi - -if test x$xmms_config_prefix != x; then - xmms_config_args="$xmms_config_args --prefix=$xmms_config_prefix" - if test x${XMMS_CONFIG+set} != xset; then - XMMS_CONFIG=$xmms_config_prefix/bin/xmms-config - fi -fi - -AC_PATH_PROG(XMMS_CONFIG, xmms-config, no) -min_xmms_version=ifelse([$1], ,0.9.5.1, $1) - -if test "$XMMS_CONFIG" = "no"; then - no_xmms=yes -else - XMMS_CFLAGS=`$XMMS_CONFIG $xmms_config_args --cflags` - XMMS_LIBS=`$XMMS_CONFIG $xmms_config_args --libs` - XMMS_VERSION=`$XMMS_CONFIG $xmms_config_args --version` - XMMS_DATA_DIR=`$XMMS_CONFIG $xmms_config_args --data-dir` - XMMS_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --plugin-dir` - XMMS_VISUALIZATION_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args \ - --visualization-plugin-dir` - XMMS_INPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --input-plugin-dir` - XMMS_OUTPUT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --output-plugin-dir` - XMMS_EFFECT_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --effect-plugin-dir` - XMMS_GENERAL_PLUGIN_DIR=`$XMMS_CONFIG $xmms_config_args --general-plugin-dir` - - XMMS_TEST_VERSION($XMMS_VERSION, $min_xmms_version, ,no_xmms=version) -fi - -AC_MSG_CHECKING(for XMMS - version >= $min_xmms_version) - -if test "x$no_xmms" = x; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - - if test "$XMMS_CONFIG" = "no" ; then - echo "*** The xmms-config script installed by XMMS could not be found." - echo "*** If XMMS was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XMMS_CONFIG environment variable to the" - echo "*** full path to xmms-config." - else - if test "$no_xmms" = "version"; then - echo "*** An old version of XMMS, $XMMS_VERSION, was found." - echo "*** You need a version of XMMS newer than $min_xmms_version." - echo "*** The latest version of XMMS is always available from" - echo "*** http://www.xmms.org/" - echo "***" - - echo "*** If you have already installed a sufficiently new version, this error" - echo "*** probably means that the wrong copy of the xmms-config shell script is" - echo "*** being found. The easiest way to fix this is to remove the old version" - echo "*** of XMMS, but you can also set the XMMS_CONFIG environment to point to the" - echo "*** correct copy of xmms-config. (In this case, you will have to" - echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" - echo "*** so that the correct libraries are found at run-time)" - fi - fi - XMMS_CFLAGS="" - XMMS_LIBS="" - ifelse([$3], , :, [$3]) -fi -AC_SUBST(XMMS_CFLAGS) -AC_SUBST(XMMS_LIBS) -AC_SUBST(XMMS_VERSION) -AC_SUBST(XMMS_DATA_DIR) -AC_SUBST(XMMS_PLUGIN_DIR) -AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) -AC_SUBST(XMMS_INPUT_PLUGIN_DIR) -AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) -AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) -AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) -]) diff --git a/packages/flac/flac.inc b/packages/flac/flac.inc new file mode 100644 index 0000000000..79fa504fec --- /dev/null +++ b/packages/flac/flac.inc @@ -0,0 +1,81 @@ +DESCRIPTION = "FLAC is a Free Lossless Audio Codec." +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 + +EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ + --with-ogg-libraries=${STAGING_LIBDIR} \ + --with-ogg-includes=${STAGING_INCDIR} \ + --without-xmms-prefix \ + --without-xmms-exec-prefix \ + --without-libiconv-prefix \ + --without-id3lib" + +do_configure () { + install -d ${S}/m4 + install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ + autotools_do_configure + # removes '-read-only-relocs' which is enabled for PowerPC builds. + # It makes the build fail, other archs are not affected. Fixes #1775. + sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile +} + +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/ +} + +PACKAGES += "libflac libflac++ liboggflac liboggflac++" +FILES_${PN} = "${bindir}/*" +FILES_libflac = "${libdir}/libFLAC.so.*" +FILES_libflac++ = "${libdir}/libFLAC++.so.*" +FILES_liboggflac = "${libdir}/libOggFLAC.so.*" +FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" diff --git a/packages/flac/flac_1.1.0.bb b/packages/flac/flac_1.1.0.bb index bcc4e01048..debe8d73de 100644 --- a/packages/flac/flac_1.1.0.bb +++ b/packages/flac/flac_1.1.0.bb @@ -1,78 +1,3 @@ -DESCRIPTION = "FLAC is a Free Lossless Audio Codec." -LICENSE = "BSD GPL" -SECTION = "libs" -DEPENDS = "libogg" -PR = "r5" +require flac.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ - file://xmms.m4" -S = "${WORKDIR}/flac-${PV}" - -inherit autotools - -EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --without-xmms-prefix \ - --without-xmms-exec-prefix \ - --without-libiconv-prefix \ - --without-id3lib" - -PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}/*" -FILES_libflac = "${libdir}/libFLAC.so.*" -FILES_libflac++ = "${libdir}/libFLAC++.so.*" -FILES_liboggflac = "${libdir}/libOggFLAC.so.*" -FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" - -do_configure () { - install -d ${S}/m4 - install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ - autotools_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}/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/ -} +PR = "r6" diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb index 85ffc9beb9..69eb07125e 100644 --- a/packages/flac/flac_1.1.2.bb +++ b/packages/flac/flac_1.1.2.bb @@ -1,84 +1,13 @@ -DESCRIPTION = "FLAC is a Free Lossless Audio Codec." -LICENSE = "BSD GPL" -SECTION = "libs" -DEPENDS = "libogg" -PR = "r5" +require flac.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ - file://disable-xmms-plugin.patch;patch=1 \ - file://xmms.m4" +PR = "r6" -S = "${WORKDIR}/flac-${PV}" - -inherit autotools - -EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ - --with-ogg-libraries=${STAGING_LIBDIR} \ - --with-ogg-includes=${STAGING_INCDIR} \ - --without-xmms-prefix \ - --without-xmms-exec-prefix \ - --without-libiconv-prefix \ - --without-id3lib" - -PACKAGES += "libflac libflac++ liboggflac liboggflac++" -FILES_${PN} = "${bindir}/*" -FILES_libflac = "${libdir}/libFLAC.so.*" -FILES_libflac++ = "${libdir}/libFLAC++.so.*" -FILES_liboggflac = "${libdir}/libOggFLAC.so.*" -FILES_liboggflac++ = "${libdir}/libOggFLAC++.so.*" - -do_configure () { - install -d ${S}/m4 - install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ - autotools_do_configure +do_configure_append () { # removes '-read-only-relocs' which is enabled for PowerPC builds. # It makes the build fail, other archs are not affected. Fixes #1775. sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile } -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 +do_stage_append () { 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/ } diff --git a/packages/gpe-plucker/gpe-plucker_0.4.bb b/packages/gpe-plucker/gpe-plucker_0.4.bb index 6e9f6b5d3b..8e90d2f06b 100644 --- a/packages/gpe-plucker/gpe-plucker_0.4.bb +++ b/packages/gpe-plucker/gpe-plucker_0.4.bb @@ -8,6 +8,7 @@ PRIORITY = "optional" SRC_URI += " file://plucker-no-host-includes.patch;patch=1" PARALLEL_MAKE="" +EXTRA_OEMAKE="RANLIB=${RANLIB}" PR = "r2" diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index 34ae157094..5bd5f987b6 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" -PR = "r1" +PR = "r2" # This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage DEFAULT_PREFERENCE = "-1" diff --git a/packages/irssi/irssi_svn.bb b/packages/irssi/irssi_svn.bb index 7d09f116e5..1fc31515d9 100644 --- a/packages/irssi/irssi_svn.bb +++ b/packages/irssi/irssi_svn.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://irssi.org/" SECTION = "console/network" LICENSE = "GPL" DEPENDS += "ncurses glib-2.0" -PV = "0.8.10+svn${SRCDATE}" -PR = "r3" +PV = "0.8.11+svn${SRCDATE}" +PR = "r4" DEFAULT_PREFERENCE = "-1" @@ -15,8 +15,9 @@ RDEPENDS_${PN} += "${PN}-common" inherit autotools +SVN_REPO_URI = "http://svn.irssi.org/repos/irssi/trunk" SRC_URI = "svn://svn.irssi.org/repos/irssi/;module=trunk;proto=http \ - file://autofoo.patch;patch=1" + " S = "${WORKDIR}/trunk" EXTRA_OECONF = "--enable-ipv6 \ @@ -34,6 +35,9 @@ EXTRA_OECONF = "--enable-ipv6 \ --with-ncurses=${STAGING_LIBDIR}/.." do_configure () { + # create the ChangeLog file that hold irssi date and time version + TZ=UTC svn log -v "${SVN_REPO_URI}" > ChangeLog + # create help files echo "Creating help files..." perl syntax.pl diff --git a/packages/flac/flac-1.1.2/.mtn2git_empty b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/flac/flac-1.1.2/.mtn2git_empty +++ b/packages/konqueror/konqueror-embedded-20070316/.mtn2git_empty diff --git a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch index c9f40c8a5f..c9f40c8a5f 100644 --- a/packages/konqueror/konqueror-embedded-20070212/dont-use-kde-config.patch +++ b/packages/konqueror/konqueror-embedded-20070316/dont-use-kde-config.patch diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch index 6feb0060c5..6feb0060c5 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqe-kapplication.patch +++ b/packages/konqueror/konqueror-embedded-20070316/konqe-kapplication.patch diff --git a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch index 1079d23fbf..a662acbd42 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqe_new_opie.patch +++ b/packages/konqueror/konqueror-embedded-20070316/konqe_new_opie.patch @@ -1,6 +1,6 @@ -diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m4 +diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox/acinclude.m4 --- kdenox/acinclude.m4 2007-02-12 22:26:21.000000000 +1300 -+++ kdenox_new/acinclude.m4 2007-02-25 22:00:27.000000000 +1300 ++++ kdenox/acinclude.m4 2007-02-25 22:00:27.000000000 +1300 @@ -880,7 +880,7 @@ ) @@ -10,9 +10,9 @@ diff -urNd --exclude-from=excludelist kdenox/acinclude.m4 kdenox_new/acinclude.m AC_HELP_STRING([--enable-rtti-embedded],[enable rtti support for Qt-embedded]), kde_use_qt_emb_rtti=$enableval, kde_use_qt_emb_rtti=no -diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.in +diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox/configure.in --- kdenox/configure.in 2007-02-12 22:26:21.000000000 +1300 -+++ kdenox_new/configure.in 2007-02-25 17:49:59.000000000 +1300 ++++ kdenox/configure.in 2007-02-25 17:49:59.000000000 +1300 @@ -60,10 +60,10 @@ @@ -26,9 +26,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in kdenox_new/configure.i fi dnl Checks for header files. -diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configure.in.in +diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox/configure.in.in --- kdenox/configure.in.in 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/configure.in.in 2007-02-25 17:49:27.000000000 +1300 ++++ kdenox/configure.in.in 2007-02-25 17:49:27.000000000 +1300 @@ -56,10 +56,10 @@ @@ -42,9 +42,9 @@ diff -urNd --exclude-from=excludelist kdenox/configure.in.in kdenox_new/configur fi dnl Checks for header files. -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox_new/konq-embed/dropin/kfiledialog.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp kdenox/konq-embed/dropin/kfiledialog.cpp --- kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-12 22:25:57.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300 ++++ kdenox/konq-embed/dropin/kfiledialog.cpp 2007-02-24 03:29:25.000000000 +1300 @@ -23,6 +23,7 @@ @@ -53,9 +53,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kfiledialog.cpp k #include <qlayout.h> #include <qconfig.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp --- kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300 ++++ kdenox/konq-embed/dropin/kio/kprotocolmanager.cpp 2007-02-24 03:32:31.000000000 +1300 @@ -23,7 +23,9 @@ */ @@ -66,9 +66,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/kprotocolmana #include <kconfig.h> #include <ioslave_defaults.h> #include <kdeversion.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox_new/konq-embed/dropin/kio/progressbase.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase.cpp kdenox/konq-embed/dropin/kio/progressbase.cpp --- kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-12 22:25:56.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300 ++++ kdenox/konq-embed/dropin/kio/progressbase.cpp 2007-02-24 03:33:10.000000000 +1300 @@ -18,6 +18,7 @@ #include "jobclasses.h" @@ -77,9 +77,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/kio/progressbase. //namespace KIO { -diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/konq-embed/ipkg/preinst +diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox/konq-embed/ipkg/preinst --- kdenox/konq-embed/ipkg/preinst 1970-01-01 12:00:00.000000000 +1200 -+++ kdenox_new/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300 ++++ kdenox/konq-embed/ipkg/preinst 2007-02-25 21:20:10.000000000 +1300 @@ -0,0 +1,15 @@ +#!/bin/sh + @@ -96,9 +96,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/ipkg/preinst kdenox_new/ + fi +done + -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h --- kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-12 21:31:39.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kdecore/kmultipledrag.h 2007-02-25 16:15:28.000000000 +1300 @@ -26,6 +26,8 @@ #include <qvaluelist.h> #include "kdelibs_export.h" @@ -108,9 +108,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kdecore/kmultiple class KMultipleDragPrivate; /** * This class makes it easy for applications to provide a drag object -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefile.am kdenox/konq-embed/kdesrc/khtml/css/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/css/Makefile.am 2007-02-25 16:36:23.000000000 +1300 @@ -39,7 +39,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ -I$(top_srcdir)/khtml -I$(top_srcdir)/libltdl -I$(top_srcdir) \ @@ -120,9 +120,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/css/Makefil cssdir = $(kde_datadir)/khtml/css css_DATA = html4.css quirks.css -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/dom/Makefile.am 2007-02-25 16:35:07.000000000 +1300 @@ -47,7 +47,7 @@ # css_extensions.h @@ -132,9 +132,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/dom/Makefil SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/ecma/Makefile.am 2007-02-25 17:24:35.000000000 +1300 @@ -16,7 +16,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. @@ -144,9 +144,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/Makefi KDE_CXXFLAGS = $(USE_EXCEPTIONS) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp --- kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/ecma/xmlhttprequest.cpp 2007-02-25 17:27:39.000000000 +1300 @@ -38,6 +38,10 @@ #include <qobject.h> #include <kdebug.h> @@ -158,9 +158,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/ecma/xmlhtt #ifdef APPLE_CHANGES #include "KWQLoader.h" #else -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefile.am kdenox/konq-embed/kdesrc/khtml/html/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/html/Makefile.am 2007-02-25 16:39:50.000000000 +1300 @@ -43,7 +43,7 @@ -I$(top_srcdir)/kio/kssl \ -I$(top_srcdir)/kjs -I$(top_srcdir)/khtml -I$(top_srcdir) \ @@ -170,9 +170,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/html/Makefi # Use "make doctypes" to regenerate doctypes.cpp from doctypes.gperf doctypes: $(srcdir)/doctypes.gperf $(srcdir)/Makefile.am -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp --- kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/khtml_part.cpp 2007-02-25 17:22:46.000000000 +1300 @@ -3221,14 +3221,14 @@ { khtml::RenderTextArea *parent= static_cast<khtml::RenderTextArea *>(obj->parent()); @@ -211,9 +211,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/khtml_part. connect( kapp->clipboard(), SIGNAL( selectionChanged()), SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/misc/Makefile.am 2007-02-25 16:33:47.000000000 +1300 @@ -32,7 +32,7 @@ stringit.h htmlhashes.h helper.h shared.h arena.h @@ -223,9 +223,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/misc/Makefi SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/Makefile.am 2007-02-25 16:40:50.000000000 +1300 @@ -42,7 +42,7 @@ render_generated.h enumerate.h @@ -235,9 +235,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/M SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-12 21:31:42.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_layer.h 2007-02-25 16:56:00.000000000 +1300 @@ -46,12 +46,14 @@ #include <qcolor.h> @@ -254,9 +254,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r namespace khtml { class RenderStyle; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp --- kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_object.cpp 2007-02-25 16:44:58.000000000 +1300 @@ -46,6 +46,7 @@ #include <kdebug.h> #include <kglobal.h> @@ -265,9 +265,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include "khtmlview.h" #include <khtml_part.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_table.h 2007-02-25 16:56:49.000000000 +1300 @@ -30,6 +30,7 @@ #include <qcolor.h> #include <qptrvector.h> @@ -276,9 +276,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include "rendering/render_box.h" #include "rendering/render_block.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h --- kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/rendering/render_text.h 2007-02-25 16:46:39.000000000 +1300 @@ -31,6 +31,7 @@ #include "rendering/render_line.h" @@ -287,9 +287,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/rendering/r #include <assert.h> class QPainter; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am --- kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/khtml/xml/Makefile.am 2007-02-25 16:38:27.000000000 +1300 @@ -37,7 +37,7 @@ INCLUDES = -I$(top_srcdir)/kimgio -I$(top_srcdir)/kio -I$(top_srcdir)/dcop \ @@ -299,9 +299,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/khtml/xml/Makefil SRCDOC_DEST=$(kde_htmldir)/en/kdelibs/khtml -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kdenox/konq-embed/kdesrc/kjs/dtoa.cpp --- kdenox/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/dtoa.cpp 2007-02-25 18:22:33.000000000 +1300 @@ -1,4 +1,9 @@ -#ifndef KONQ_EMBEDDED +#include <config.h> @@ -322,9 +322,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.cpp kden #include "stdlib.h" #ifdef WORDS_BIGENDIAN -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox_new/konq-embed/kdesrc/kjs/dtoa.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox/konq-embed/kdesrc/kjs/dtoa.h --- kdenox/konq-embed/kdesrc/kjs/dtoa.h 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/dtoa.h 2007-02-25 18:20:51.000000000 +1300 @@ -23,14 +23,11 @@ #ifndef _KJS_DTOA_H_ #define _KJS_DTOA_H_ @@ -342,9 +342,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/dtoa.h kdenox - + #endif /* _KJS_DTOA_H */ -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object.cpp kdenox/konq-embed/kdesrc/kjs/number_object.cpp --- kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/number_object.cpp 2007-02-25 18:05:36.000000000 +1300 @@ -20,6 +20,8 @@ * */ @@ -354,9 +354,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/number_object #include "value.h" #include "object.h" #include "types.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp kdenox/konq-embed/kdesrc/kjs/ustring.cpp --- kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-12 22:26:20.000000000 +1300 -+++ kdenox_new/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300 ++++ kdenox/konq-embed/kdesrc/kjs/ustring.cpp 2007-02-25 18:10:22.000000000 +1300 @@ -21,9 +21,7 @@ * */ @@ -367,9 +367,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/kdesrc/kjs/ustring.cpp k #include <stdlib.h> #include <stdio.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox_new/konq-embed/src/actions/konqe.rc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kdenox/konq-embed/src/actions/konqe.rc --- kdenox/konq-embed/src/actions/konqe.rc 1970-01-01 12:00:00.000000000 +1200 -+++ kdenox_new/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300 ++++ kdenox/konq-embed/src/actions/konqe.rc 2007-02-25 21:20:10.000000000 +1300 @@ -0,0 +1,107 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="konqe" version="1"> @@ -478,9 +478,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/actions/konqe.rc kde + <Action name="edit_paste"/> +</ToolBar> +</kpartgui> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox_new/konq-embed/src/bookmarkeditimpl.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc kdenox/konq-embed/src/bookmarkeditimpl.cc --- kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditimpl.cc 2007-02-25 19:17:29.000000000 +1300 @@ -24,6 +24,8 @@ #include "bookmarkeditimpl.h" @@ -490,9 +490,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditimpl.cc #if defined(ENABLE_BOOKMARKS) #include "mainwindowbase.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox_new/konq-embed/src/bookmarkeditor.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kdenox/konq-embed/src/bookmarkeditor.cc --- kdenox/konq-embed/src/bookmarkeditor.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditor.cc 2007-02-25 17:40:34.000000000 +1300 @@ -16,6 +16,8 @@ #include <qimage.h> #include <qpixmap.h> @@ -502,9 +502,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditor.cc kd namespace { QPixmap getPngPixmap( const QString &name ) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.cc kdenox/konq-embed/src/bookmarkeditorhierarchical.cc --- kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.cc 2007-02-25 20:46:27.000000000 +1300 @@ -22,11 +22,20 @@ */ @@ -535,9 +535,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar edit->location->setEnabled(false); edit->location->hide(); edit->TextLabel2->hide(); -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierarchical.h kdenox/konq-embed/src/bookmarkeditorhierarchical.h --- kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorhierarchical.h 2007-02-25 18:27:17.000000000 +1300 @@ -22,9 +22,10 @@ #ifndef __bookmarkeditorhierarchical_h__ #define __bookmarkeditorhierarchical_h__ @@ -550,9 +550,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorhierar #include "bookmarkeditorimpl.h" class XMLElement; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox_new/konq-embed/src/bookmarkeditorimpl.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.cc kdenox/konq-embed/src/bookmarkeditorimpl.cc --- kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarkeditorimpl.cc 2007-02-25 19:16:40.000000000 +1300 @@ -23,12 +23,12 @@ #include "bookmarkeditorimpl.h" @@ -568,9 +568,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarkeditorimpl.c #include "bookmarks.h" #include "xmltree.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_new/konq-embed/src/bookmarks.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox/konq-embed/src/bookmarks.cc --- kdenox/konq-embed/src/bookmarks.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarks.cc 2007-02-25 18:28:08.000000000 +1300 @@ -24,6 +24,8 @@ #if defined(ENABLE_BOOKMARKS) @@ -588,9 +588,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.cc kdenox_ #include <klocale.h> #include <kstandarddirs.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_new/konq-embed/src/bookmarks.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox/konq-embed/src/bookmarks.h --- kdenox/konq-embed/src/bookmarks.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300 ++++ kdenox/konq-embed/src/bookmarks.h 2007-02-25 18:26:32.000000000 +1300 @@ -34,6 +34,8 @@ #include <kurl.h> @@ -600,9 +600,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/bookmarks.h kdenox_n class QPopupMenu; class XMLElement; class ActionMenu; -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox_new/konq-embed/src/mainwindow_qpe.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kdenox/konq-embed/src/mainwindow_qpe.cc --- kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_qpe.cc 2007-02-25 17:46:32.000000000 +1300 @@ -90,7 +90,7 @@ return iconSet; } @@ -621,9 +621,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.cc kd { statusJustText( _msg, visible ); } -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox_new/konq-embed/src/mainwindow_qpe.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kdenox/konq-embed/src/mainwindow_qpe.h --- kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_qpe.h 2007-02-25 17:47:23.000000000 +1300 @@ -39,6 +39,10 @@ protected: @@ -635,9 +635,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_qpe.h kde }; #endif -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox_new/konq-embed/src/mainwindow_road.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc kdenox/konq-embed/src/mainwindow_road.cc --- kdenox/konq-embed/src/mainwindow_road.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_road.cc 2007-02-25 20:32:12.000000000 +1300 @@ -20,10 +20,11 @@ #ifdef KONQ_GUI_ROAD @@ -651,9 +651,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_road.cc k #include <qpopupmenu.h> #include <qtoolbar.h> #include <qaction.h> -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox_new/konq-embed/src/mainwindow_x11.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kdenox/konq-embed/src/mainwindow_x11.cc --- kdenox/konq-embed/src/mainwindow_x11.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.000000000 +1300 ++++ kdenox/konq-embed/src/mainwindow_x11.cc 2007-02-25 20:33:10.000000000 +1300 @@ -21,6 +21,8 @@ // Implementation of the X11 GUI @@ -663,9 +663,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/mainwindow_x11.cc kd #include "mainwindow_x11.h" #include "popupaction.h" -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox_new/konq-embed/src/roadtabbar.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox/konq-embed/src/roadtabbar.cc --- kdenox/konq-embed/src/roadtabbar.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.000000000 +1300 ++++ kdenox/konq-embed/src/roadtabbar.cc 2007-02-25 17:44:19.000000000 +1300 @@ -18,6 +18,9 @@ Boston, MA 02110-1301, USA. */ @@ -700,9 +700,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.cc kdenox // the caption may not exceed a given width, so shorten it if necessary // the following is inefficient, but clear, correct, and unlikely to be a bottleneck if ( m_params.fontMetrics.width( caption ) > m_params.maxWidth ) -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_new/konq-embed/src/roadtabbar.h +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox/konq-embed/src/roadtabbar.h --- kdenox/konq-embed/src/roadtabbar.h 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300 ++++ kdenox/konq-embed/src/roadtabbar.h 2007-02-25 17:42:40.000000000 +1300 @@ -22,6 +22,9 @@ #define __roadtabbar_h__ @@ -713,9 +713,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/roadtabbar.h kdenox_ struct RoadTabParams { -diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/konq-embed/src/run.cc +diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox/konq-embed/src/run.cc --- kdenox/konq-embed/src/run.cc 2007-02-12 22:25:55.000000000 +1300 -+++ kdenox_new/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300 ++++ kdenox/konq-embed/src/run.cc 2007-02-25 17:34:35.000000000 +1300 @@ -24,6 +24,7 @@ #include "view.h" @@ -733,9 +733,9 @@ diff -urNd --exclude-from=excludelist kdenox/konq-embed/src/run.cc kdenox_new/ko m_bFinished = true; emit error(); -diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp +diff -urNd --exclude-from=excludelist kdenox/konq-embed/dropin/khtml/khtml_ext.cpp kdenox/konq-embed/dropin/khtml/khtml_ext.cpp --- kdenox/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-12 22:25:56.000000000 +1300 -+++ kdenox_new/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.000000000 +1300 ++++ kdenox/konq-embed/dropin/khtml/khtml_ext.cpp 2007-02-24 03:38:24.000000000 +1300 @@ -115,7 +115,8 @@ const QString &filter, long cacheId, const QString & suggestedFilename, const QString& mimeType ) diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop index 1f473117e9..cb84c96be1 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqueror.desktop +++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.desktop @@ -2,5 +2,5 @@ Exec=konqueror Icon=konqueror/konqueror Type=Application -Name=konqueror +Name=Konqueror Comment=Konqueror browser diff --git a/packages/konqueror/konqueror-embedded-20070212/konqueror.png b/packages/konqueror/konqueror-embedded-20070316/konqueror.png Binary files differindex 879d470bbf..879d470bbf 100644 --- a/packages/konqueror/konqueror-embedded-20070212/konqueror.png +++ b/packages/konqueror/konqueror-embedded-20070316/konqueror.png diff --git a/packages/konqueror/konqueror-embedded_20070212.bb b/packages/konqueror/konqueror-embedded_20070316.bb index 3fb8a5cfa6..5a127515bb 100644 --- a/packages/konqueror/konqueror-embedded_20070212.bb +++ b/packages/konqueror/konqueror-embedded_20070316.bb @@ -10,10 +10,11 @@ PR = "r5" inherit autotools -SRC_URI = "http://www.basyskom.de/uploads/175/35/kdenox_snapshot_Qt2_2007.02.12.tar.bz2 \ +SRC_URI = "http://www.basyskom.de/uploads/175/37/kdenox_snapshot_qt2_20070316.tar.bz2 \ file://dont-use-kde-config.patch;patch=1 \ file://konqe_new_opie.patch;patch=1 \ - file://konqe-kapplication.patch;patch=1" + file://konqe-kapplication.patch;patch=1 \ + file://fix_configure.patch;patch=1" S = "${WORKDIR}/kdenox" export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake" diff --git a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty b/packages/libmpcdec/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/konqueror/konqueror-embedded-20070212/.mtn2git_empty +++ b/packages/libmpcdec/.mtn2git_empty diff --git a/packages/libmpcdec/libmpcdec_1.2.6.bb b/packages/libmpcdec/libmpcdec_1.2.6.bb new file mode 100644 index 0000000000..43249248a2 --- /dev/null +++ b/packages/libmpcdec/libmpcdec_1.2.6.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Portable Musepack decoder library" +AUTHOR = "Meni Berman <musepack@gmail.com>" +HOMEPAGE = "http://www.musepack.net" +SECTION = "libs" +LICENSE = "BSD GPL" +PR = "r0" + +SRC_URI = "http://files.musepack.net/source/libmpcdec-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF += "ac_cv_func_memcmp_working=yes" + +do_configure () { + oe_runconf +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch new file mode 100644 index 0000000000..ef9a0ed0fe --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-TWL4030-codec-driver.patch @@ -0,0 +1,831 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:27 +0000 (-0700) +Subject: ASoC TWL4030 codec driver +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=67b73de03016cc31b1f91af93c57b8e749c13520;hp=d3b3ae0fe6c71641da19c8de466ec366d39847e3 + +ASoC TWL4030 codec driver + +Basic audio support for the TWL4030 + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig +index 3903ab7..468536d 100644 +--- a/sound/soc/codecs/Kconfig ++++ b/sound/soc/codecs/Kconfig +@@ -44,3 +44,7 @@ config SND_SOC_CS4270_VD33_ERRATA + config SND_SOC_TLV320AIC3X + tristate + depends on SND_SOC && I2C ++ ++config SND_SOC_TWL4030 ++ tristate ++ depends on SND_SOC && I2C +diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile +index 4e1314c..d2c0b12 100644 +--- a/sound/soc/codecs/Makefile ++++ b/sound/soc/codecs/Makefile +@@ -6,6 +6,7 @@ snd-soc-wm9712-objs := wm9712.o + snd-soc-wm9713-objs := wm9713.o + snd-soc-cs4270-objs := cs4270.o + snd-soc-tlv320aic3x-objs := tlv320aic3x.o ++snd-soc-twl4030-objs := twl4030.o + + obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o + obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o +@@ -15,3 +16,4 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o + obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o + obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o + obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o ++obj-$(CONFIG_SND_SOC_TWL4030) += snd-soc-twl4030.o +diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c +new file mode 100644 +index 0000000..25a154c +--- /dev/null ++++ b/sound/soc/codecs/twl4030.c +@@ -0,0 +1,626 @@ ++/* ++ * ALSA SoC TWL4030 codec driver ++ * ++ * Author: Steve Sakoman, <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/module.h> ++#include <linux/moduleparam.h> ++#include <linux/init.h> ++#include <linux/delay.h> ++#include <linux/pm.h> ++#include <linux/i2c.h> ++#include <linux/platform_device.h> ++#include <linux/i2c/twl4030.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/pcm_params.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++#include <sound/initval.h> ++ ++#include "twl4030.h" ++ ++/* ++ * twl4030 register cache & default register settings ++ */ ++static const u8 twl4030_reg[TWL4030_CACHEREGNUM] = { ++ 0x00, /* this register not used */ ++ 0x93, /* REG_CODEC_MODE (0x1) */ ++ 0xc3, /* REG_OPTION (0x2) */ ++ 0x00, /* REG_UNKNOWN (0x3) */ ++ 0x00, /* REG_MICBIAS_CTL (0x4) */ ++ 0x34, /* REG_ANAMICL (0x5) */ ++ 0x14, /* REG_ANAMICR (0x6) */ ++ 0x0a, /* REG_AVADC_CTL (0x7) */ ++ 0x00, /* REG_ADCMICSEL (0x8) */ ++ 0x00, /* REG_DIGMIXING (0x9) */ ++ 0x0c, /* REG_ATXL1PGA (0xA) */ ++ 0x0c, /* REG_ATXR1PGA (0xB) */ ++ 0x00, /* REG_AVTXL2PGA (0xC) */ ++ 0x00, /* REG_AVTXR2PGA (0xD) */ ++ 0x01, /* REG_AUDIO_IF (0xE) */ ++ 0x00, /* REG_VOICE_IF (0xF) */ ++ 0x00, /* REG_ARXR1PGA (0x10) */ ++ 0x00, /* REG_ARXL1PGA (0x11) */ ++ 0x6c, /* REG_ARXR2PGA (0x12) */ ++ 0x6c, /* REG_ARXL2PGA (0x13) */ ++ 0x00, /* REG_VRXPGA (0x14) */ ++ 0x00, /* REG_VSTPGA (0x15) */ ++ 0x00, /* REG_VRX2ARXPGA (0x16) */ ++ 0x0c, /* REG_AVDAC_CTL (0x17) */ ++ 0x00, /* REG_ARX2VTXPGA (0x18) */ ++ 0x00, /* REG_ARXL1_APGA_CTL (0x19) */ ++ 0x00, /* REG_ARXR1_APGA_CTL (0x1A) */ ++ 0x4b, /* REG_ARXL2_APGA_CTL (0x1B) */ ++ 0x4b, /* REG_ARXR2_APGA_CTL (0x1C) */ ++ 0x00, /* REG_ATX2ARXPGA (0x1D) */ ++ 0x00, /* REG_BT_IF (0x1E) */ ++ 0x00, /* REG_BTPGA (0x1F) */ ++ 0x00, /* REG_BTSTPGA (0x20) */ ++ 0x00, /* REG_EAR_CTL (0x21) */ ++ 0x24, /* REG_HS_SEL (0x22) */ ++ 0x0a, /* REG_HS_GAIN_SET (0x23) */ ++ 0x00, /* REG_HS_POPN_SET (0x24) */ ++ 0x00, /* REG_PREDL_CTL (0x25) */ ++ 0x00, /* REG_PREDR_CTL (0x26) */ ++ 0x00, /* REG_PRECKL_CTL (0x27) */ ++ 0x00, /* REG_PRECKR_CTL (0x28) */ ++ 0x00, /* REG_HFL_CTL (0x29) */ ++ 0x00, /* REG_HFR_CTL (0x2A) */ ++ 0x00, /* REG_ALC_CTL (0x2B) */ ++ 0x00, /* REG_ALC_SET1 (0x2C) */ ++ 0x00, /* REG_ALC_SET2 (0x2D) */ ++ 0x00, /* REG_BOOST_CTL (0x2E) */ ++ 0x01, /* REG_SOFTVOL_CTL (0x2F) */ ++ 0x00, /* REG_DTMF_FREQSEL (0x30) */ ++ 0x00, /* REG_DTMF_TONEXT1H (0x31) */ ++ 0x00, /* REG_DTMF_TONEXT1L (0x32) */ ++ 0x00, /* REG_DTMF_TONEXT2H (0x33) */ ++ 0x00, /* REG_DTMF_TONEXT2L (0x34) */ ++ 0x00, /* REG_DTMF_TONOFF (0x35) */ ++ 0x00, /* REG_DTMF_WANONOFF (0x36) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_H (0x37) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_M (0x38) */ ++ 0x00, /* REG_I2S_RX_SCRAMBLE_L (0x39) */ ++ 0x16, /* REG_APLL_CTL (0x3A) */ ++ 0x00, /* REG_DTMF_CTL (0x3B) */ ++ 0x00, /* REG_DTMF_PGA_CTL2 (0x3C) */ ++ 0x00, /* REG_DTMF_PGA_CTL1 (0x3D) */ ++ 0x00, /* REG_MISC_SET_1 (0x3E) */ ++ 0x00, /* REG_PCMBTMUX (0x3F) */ ++ 0x00, /* not used (0x40) */ ++ 0x00, /* not used (0x41) */ ++ 0x00, /* not used (0x42) */ ++ 0x00, /* REG_RX_PATH_SEL (0x43) */ ++ 0x00, /* REG_VDL_APGA_CTL (0x44) */ ++ 0x00, /* REG_VIBRA_CTL (0x45) */ ++ 0x00, /* REG_VIBRA_SET (0x46) */ ++ 0x00, /* REG_VIBRA_PWM_SET (0x47) */ ++ 0x00, /* REG_ANAMIC_GAIN (0x48) */ ++ 0x00, /* REG_MISC_SET_2 (0x49) */ ++}; ++ ++static void twl4030_dump_registers(void) ++{ ++ int i = 0; ++ u8 data; ++ ++ printk(KERN_INFO "TWL 4030 Register dump for Audio Module\n"); ++ ++ for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) { ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &data, i); ++ printk(KERN_INFO "Register[0x%02x]=0x%02x\n", i, data); ++ } ++} ++ ++struct twl4030_priv { ++ unsigned int dummy; ++}; ++ ++/* ++ * read twl4030 register cache ++ */ ++static inline unsigned int twl4030_read_reg_cache(struct snd_soc_codec *codec, ++ unsigned int reg) ++{ ++ u8 *cache = codec->reg_cache; ++ ++ return cache[reg]; ++} ++ ++/* ++ * write twl4030 register cache ++ */ ++static inline void twl4030_write_reg_cache(struct snd_soc_codec *codec, ++ u8 reg, u8 value) ++{ ++ u8 *cache = codec->reg_cache; ++ ++ if (reg >= TWL4030_CACHEREGNUM) ++ return; ++ cache[reg] = value; ++} ++ ++/* ++ * write to the twl4030 register space ++ */ ++static int twl4030_write(struct snd_soc_codec *codec, ++ unsigned int reg, unsigned int value) ++{ ++ twl4030_write_reg_cache(codec, reg, value); ++ return twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg); ++} ++ ++static void twl4030_init_chip(void) ++{ ++ unsigned char byte; ++ int i; ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_CODEC_MODE] & 0xfd, REG_CODEC_MODE); ++ ++ udelay(10); /* delay for power settling */ ++ ++ for (i = REG_OPTION; i <= REG_MISC_SET_2; i++) ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[i], i); ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_CODEC_MODE], REG_CODEC_MODE); ++ ++ udelay(10); /* delay for power settling */ ++ ++ /* initiate offset cancellation */ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_ANAMICL] | 0x80, REG_ANAMICL); ++ ++ /* wait for offset cancellation to complete */ ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &byte, REG_ANAMICL); ++ while ((byte & 0x80) == 0x80) ++ twl4030_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, ++ &byte, REG_ANAMICL); ++ ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, ++ twl4030_reg[REG_MISC_SET_1] | 0x02, REG_MISC_SET_1); ++ ++} ++ ++static const struct snd_kcontrol_new twl4030_snd_controls[] = { ++ SOC_DOUBLE_R("Master Playback Volume", ++ REG_ARXL2PGA, REG_ARXR2PGA, ++ 0, 127, 0), ++ SOC_DOUBLE_R("Capture Volume", ++ REG_ATXL1PGA, REG_ATXR1PGA, ++ 0, 127, 0), ++}; ++ ++/* add non dapm controls */ ++static int twl4030_add_controls(struct snd_soc_codec *codec) ++{ ++ int err, i; ++ ++ for (i = 0; i < ARRAY_SIZE(twl4030_snd_controls); i++) { ++ err = snd_ctl_add(codec->card, ++ snd_soc_cnew(&twl4030_snd_controls[i], ++ codec, NULL)); ++ if (err < 0) ++ return err; ++ } ++ ++ return 0; ++} ++ ++static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { ++ SND_SOC_DAPM_INPUT("INL"), ++ SND_SOC_DAPM_INPUT("INR"), ++ ++ SND_SOC_DAPM_OUTPUT("OUTL"), ++ SND_SOC_DAPM_OUTPUT("OUTR"), ++ ++ SND_SOC_DAPM_DAC("DACL", "Left Playback", SND_SOC_NOPM, 0, 0), ++ SND_SOC_DAPM_DAC("DACR", "Right Playback", SND_SOC_NOPM, 0, 0), ++ ++ SND_SOC_DAPM_ADC("ADCL", "Left Capture", SND_SOC_NOPM, 0, 0), ++ SND_SOC_DAPM_ADC("ADCR", "Right Capture", SND_SOC_NOPM, 0, 0), ++}; ++ ++static const char *intercon[][3] = { ++ /* outputs */ ++ {"OUTL", NULL, "DACL"}, ++ {"OUTR", NULL, "DACR"}, ++ ++ /* inputs */ ++ {"ADCL", NULL, "INL"}, ++ {"ADCR", NULL, "INR"}, ++ ++ /* terminator */ ++ {NULL, NULL, NULL}, ++}; ++ ++static int twl4030_add_widgets(struct snd_soc_codec *codec) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(twl4030_dapm_widgets); i++) ++ snd_soc_dapm_new_control(codec, &twl4030_dapm_widgets[i]); ++ ++ /* set up audio path interconnects */ ++ for (i = 0; intercon[i][0] != NULL; i++) ++ snd_soc_dapm_connect_input(codec, intercon[i][0], ++ intercon[i][1], intercon[i][2]); ++ ++ snd_soc_dapm_new_widgets(codec); ++ return 0; ++} ++ ++static int twl4030_dapm_event(struct snd_soc_codec *codec, int event) ++{ ++ ++ printk(KERN_INFO "TWL4030 Audio Codec dapm event\n"); ++ switch (event) { ++ case SNDRV_CTL_POWER_D0: /* full On */ ++ break; ++ case SNDRV_CTL_POWER_D1: /* partial On */ ++ case SNDRV_CTL_POWER_D2: /* partial On */ ++ break; ++ case SNDRV_CTL_POWER_D3hot: /* off, with power */ ++ break; ++ case SNDRV_CTL_POWER_D3cold: /* off, without power */ ++ break; ++ } ++ codec->dapm_state = event; ++ ++ return 0; ++} ++ ++static void twl4030_power_up(struct snd_soc_codec *codec, u8 mode) ++{ ++ u8 popn, hsgain; ++ ++ twl4030_write(codec, REG_CODEC_MODE, mode & ~CODECPDZ); ++ twl4030_write(codec, REG_CODEC_MODE, mode | CODECPDZ); ++ udelay(10); ++ ++ popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); ++ popn &= RAMP_DELAY; ++ popn |= VMID_EN | RAMP_DELAY_161MS; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ hsgain = HSR_GAIN_0DB | HSL_GAIN_0DB; ++ twl4030_write(codec, REG_HS_GAIN_SET, hsgain); ++ ++ popn |= RAMP_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++} ++ ++static void twl4030_power_down(struct snd_soc_codec *codec) ++{ ++ u8 popn, hsgain, mode; ++ ++ popn = twl4030_read_reg_cache(codec, REG_HS_POPN_SET); ++ popn &= ~RAMP_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ hsgain = HSR_GAIN_PWR_DOWN | HSL_GAIN_PWR_DOWN; ++ twl4030_write(codec, REG_HS_GAIN_SET, hsgain); ++ ++ popn &= ~VMID_EN; ++ twl4030_write(codec, REG_HS_POPN_SET, popn); ++ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ udelay(10); ++} ++ ++ ++static int twl4030_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_device *socdev = rtd->socdev; ++ struct snd_soc_codec *codec = socdev->codec; ++ struct twl4030_priv *twl4030 = codec->private_data; ++ u8 mode, old_mode, format, old_format; ++ ++ ++ /* bit rate */ ++ old_mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE) & ~CODECPDZ; ++ mode = old_mode; ++ mode &= ~APLL_RATE; ++ switch (params_rate(params)) { ++ case 44100: ++ mode |= APLL_RATE_44100; ++ break; ++ case 48000: ++ mode |= APLL_RATE_48000; ++ break; ++ default: ++ printk(KERN_INFO "TWL4030 hw params: unknown rate %d\n", ++ params_rate(params)); ++ return -EINVAL; ++ } ++ ++ if (mode != old_mode) { ++ /* change rate and turn codec back on */ ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ ++ /* sample size */ ++ old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); ++ format = old_format; ++ format &= ~DATA_WIDTH; ++ switch (params_format(params)) { ++ case SNDRV_PCM_FORMAT_S16_LE: ++ format |= DATA_WIDTH_16S_16W; ++ break; ++ case SNDRV_PCM_FORMAT_S24_LE: ++ format |= DATA_WIDTH_32S_24W; ++ break; ++ default: ++ printk(KERN_INFO "TWL4030 hw params: unknown format %d\n", ++ params_format(params)); ++ return -EINVAL; ++ } ++ ++ if (format != old_format) { ++ ++ /* turn off codec before changing format */ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ ++ /* change format */ ++ twl4030_write(codec, REG_AUDIO_IF, format); ++ ++ /* turn on codec */ ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ return 0; ++} ++ ++static int twl4030_mute(struct snd_soc_codec_dai *dai, int mute) ++{ ++ struct snd_soc_codec *codec = dai->codec; ++ ++ u8 ldac_reg = twl4030_read_reg_cache(codec, REG_ARXL2PGA); ++ u8 rdac_reg = twl4030_read_reg_cache(codec, REG_ARXR2PGA); ++ ++ if (mute) { ++ twl4030_write(codec, REG_ARXL2PGA, 0x00); ++ twl4030_write(codec, REG_ARXR2PGA, 0x00); ++ twl4030_write_reg_cache(codec, REG_ARXL2PGA, ldac_reg); ++ twl4030_write_reg_cache(codec, REG_ARXR2PGA, rdac_reg); ++ } else { ++ twl4030_write(codec, REG_ARXL2PGA, ldac_reg); ++ twl4030_write(codec, REG_ARXR2PGA, rdac_reg); ++ } ++ ++ return 0; ++} ++ ++static int twl4030_set_dai_fmt(struct snd_soc_codec_dai *codec_dai, ++ unsigned int fmt) ++{ ++ struct snd_soc_codec *codec = codec_dai->codec; ++ struct twl4030_priv *twl4030 = codec->private_data; ++ u8 mode, old_format, format; ++ ++ /* get format */ ++ old_format = twl4030_read_reg_cache(codec, REG_AUDIO_IF); ++ format = old_format; ++ ++ /* set master/slave audio interface */ ++ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { ++ case SND_SOC_DAIFMT_CBM_CFM: ++ format &= ~(AIF_SLAVE_EN); ++ format |= CLK256FS_EN; ++ break; ++ case SND_SOC_DAIFMT_CBS_CFS: ++ format &= ~(CLK256FS_EN); ++ format |= AIF_SLAVE_EN; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ /* interface format */ ++ format &= ~AIF_FORMAT; ++ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { ++ case SND_SOC_DAIFMT_I2S: ++ /* printk(KERN_INFO "TWL4030 set dai fmt: i2s\n"); */ ++ format |= AIF_FORMAT_CODEC; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ if (format != old_format) { ++ ++ /* turn off codec before changing format */ ++ mode = twl4030_read_reg_cache(codec, REG_CODEC_MODE); ++ mode &= ~CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ ++ /* change format */ ++ twl4030_write(codec, REG_AUDIO_IF, format); ++ ++ mode |= CODECPDZ; ++ twl4030_write(codec, REG_CODEC_MODE, mode); ++ } ++ ++ return 0; ++} ++ ++#define TWL4030_RATES (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) ++#define TWL4030_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE) ++ ++struct snd_soc_codec_dai twl4030_dai = { ++ .name = "twl4030", ++ .playback = { ++ .stream_name = "Playback", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = TWL4030_RATES, ++ .formats = TWL4030_FORMATS,}, ++ .capture = { ++ .stream_name = "Capture", ++ .channels_min = 2, ++ .channels_max = 2, ++ .rates = TWL4030_RATES, ++ .formats = TWL4030_FORMATS,}, ++ .ops = { ++ .hw_params = twl4030_hw_params, ++ }, ++ .dai_ops = { ++ .digital_mute = twl4030_mute, ++ .set_fmt = twl4030_set_dai_fmt, ++ } ++}; ++EXPORT_SYMBOL_GPL(twl4030_dai); ++ ++static int twl4030_suspend(struct platform_device *pdev, pm_message_t state) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec suspend\n"); ++ twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3cold); ++ ++ return 0; ++} ++ ++static int twl4030_resume(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ int i; ++ u16 *cache = codec->reg_cache; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec resume\n"); ++ /* Sync reg_cache with the hardware */ ++ for (i = REG_CODEC_MODE; i <= REG_MISC_SET_2; i++) ++ twl4030_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, cache[i], i); ++ ++ twl4030_dapm_event(codec, SNDRV_CTL_POWER_D3hot); ++ twl4030_dapm_event(codec, codec->suspend_dapm_state); ++ return 0; ++} ++ ++/* ++ * initialize the driver ++ * register the mixer and dsp interfaces with the kernel ++ */ ++ ++static int twl4030_init(struct snd_soc_device *socdev) ++{ ++ struct snd_soc_codec *codec = socdev->codec; ++ int ret = 0; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec init \n"); ++ ++ codec->name = "twl4030"; ++ codec->owner = THIS_MODULE; ++ codec->read = twl4030_read_reg_cache; ++ codec->write = twl4030_write; ++ codec->dapm_event = twl4030_dapm_event; ++ codec->dai = &twl4030_dai; ++ codec->num_dai = 1; ++ codec->reg_cache_size = sizeof(twl4030_reg); ++ codec->reg_cache = kmemdup(twl4030_reg, sizeof(twl4030_reg), ++ GFP_KERNEL); ++ if (codec->reg_cache == NULL) ++ return -ENOMEM; ++ ++ /* register pcms */ ++ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); ++ if (ret < 0) { ++ printk(KERN_ERR "twl4030: failed to create pcms\n"); ++ goto pcm_err; ++ } ++ ++ twl4030_add_controls(codec); ++ twl4030_add_widgets(codec); ++ ++ ret = snd_soc_register_card(socdev); ++ if (ret < 0) { ++ printk(KERN_ERR "twl4030: failed to register card\n"); ++ goto card_err; ++ } ++ ++ twl4030_init_chip(); ++ twl4030_power_up(codec, APLL_RATE_44100 | OPT_MODE); ++ ++ return ret; ++ ++card_err: ++ printk(KERN_INFO "TWL4030 Audio Codec init card error\n"); ++ snd_soc_free_pcms(socdev); ++ snd_soc_dapm_free(socdev); ++pcm_err: ++ printk(KERN_INFO "TWL4030 Audio Codec init pcm error\n"); ++ kfree(codec->reg_cache); ++ return ret; ++} ++ ++static struct snd_soc_device *twl4030_socdev; ++ ++static int twl4030_probe(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec; ++ struct twl4030_priv *twl4030; ++ ++ codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); ++ if (codec == NULL) ++ return -ENOMEM; ++ ++ twl4030 = kzalloc(sizeof(struct twl4030_priv), GFP_KERNEL); ++ if (twl4030 == NULL) { ++ kfree(codec); ++ return -ENOMEM; ++ } ++ ++ codec->private_data = twl4030; ++ socdev->codec = codec; ++ mutex_init(&codec->mutex); ++ INIT_LIST_HEAD(&codec->dapm_widgets); ++ INIT_LIST_HEAD(&codec->dapm_paths); ++ ++ twl4030_socdev = socdev; ++ twl4030_init(socdev); ++ ++ return 0; ++} ++ ++static int twl4030_remove(struct platform_device *pdev) ++{ ++ struct snd_soc_device *socdev = platform_get_drvdata(pdev); ++ struct snd_soc_codec *codec = socdev->codec; ++ ++ printk(KERN_INFO "TWL4030 Audio Codec remove\n"); ++ kfree(codec->private_data); ++ kfree(codec); ++ ++ return 0; ++} ++ ++struct snd_soc_codec_device soc_codec_dev_twl4030 = { ++ .probe = twl4030_probe, ++ .remove = twl4030_remove, ++ .suspend = twl4030_suspend, ++ .resume = twl4030_resume, ++}; ++EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030); ++ ++MODULE_DESCRIPTION("ASoC TWL4030 codec driver"); ++MODULE_AUTHOR("Steve Sakoman"); ++MODULE_LICENSE("GPL"); +diff --git a/sound/soc/codecs/twl4030.h b/sound/soc/codecs/twl4030.h +new file mode 100644 +index 0000000..6eecde1 +--- /dev/null ++++ b/sound/soc/codecs/twl4030.h +@@ -0,0 +1,152 @@ ++/* ++ * ALSA SoC TWL4030 codec driver ++ * ++ * Author: Steve Sakoman, <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#ifndef __TWL4030_AUDIO_H__ ++#define __TWL4030_AUDIO_H__ ++ ++#define REG_CODEC_MODE 0x1 ++#define REG_OPTION 0x2 ++#define REG_UNKNOWN 0x3 ++#define REG_MICBIAS_CTL 0x4 ++#define REG_ANAMICL 0x5 ++#define REG_ANAMICR 0x6 ++#define REG_AVADC_CTL 0x7 ++#define REG_ADCMICSEL 0x8 ++#define REG_DIGMIXING 0x9 ++#define REG_ATXL1PGA 0xA ++#define REG_ATXR1PGA 0xB ++#define REG_AVTXL2PGA 0xC ++#define REG_AVTXR2PGA 0xD ++#define REG_AUDIO_IF 0xE ++#define REG_VOICE_IF 0xF ++#define REG_ARXR1PGA 0x10 ++#define REG_ARXL1PGA 0x11 ++#define REG_ARXR2PGA 0x12 ++#define REG_ARXL2PGA 0x13 ++#define REG_VRXPGA 0x14 ++#define REG_VSTPGA 0x15 ++#define REG_VRX2ARXPGA 0x16 ++#define REG_AVDAC_CTL 0x17 ++#define REG_ARX2VTXPGA 0x18 ++#define REG_ARXL1_APGA_CTL 0x19 ++#define REG_ARXR1_APGA_CTL 0x1A ++#define REG_ARXL2_APGA_CTL 0x1B ++#define REG_ARXR2_APGA_CTL 0x1C ++#define REG_ATX2ARXPGA 0x1D ++#define REG_BT_IF 0x1E ++#define REG_BTPGA 0x1F ++#define REG_BTSTPGA 0x20 ++#define REG_EAR_CTL 0x21 ++#define REG_HS_SEL 0x22 ++#define REG_HS_GAIN_SET 0x23 ++#define REG_HS_POPN_SET 0x24 ++#define REG_PREDL_CTL 0x25 ++#define REG_PREDR_CTL 0x26 ++#define REG_PRECKL_CTL 0x27 ++#define REG_PRECKR_CTL 0x28 ++#define REG_HFL_CTL 0x29 ++#define REG_HFR_CTL 0x2A ++#define REG_ALC_CTL 0x2B ++#define REG_ALC_SET1 0x2C ++#define REG_ALC_SET2 0x2D ++#define REG_BOOST_CTL 0x2E ++#define REG_SOFTVOL_CTL 0x2F ++#define REG_DTMF_FREQSEL 0x30 ++#define REG_DTMF_TONEXT1H 0x31 ++#define REG_DTMF_TONEXT1L 0x32 ++#define REG_DTMF_TONEXT2H 0x33 ++#define REG_DTMF_TONEXT2L 0x34 ++#define REG_DTMF_TONOFF 0x35 ++#define REG_DTMF_WANONOFF 0x36 ++#define REG_I2S_RX_SCRAMBLE_H 0x37 ++#define REG_I2S_RX_SCRAMBLE_M 0x38 ++#define REG_I2S_RX_SCRAMBLE_L 0x39 ++#define REG_APLL_CTL 0x3A ++#define REG_DTMF_CTL 0x3B ++#define REG_DTMF_PGA_CTL2 0x3C ++#define REG_DTMF_PGA_CTL1 0x3D ++#define REG_MISC_SET_1 0x3E ++#define REG_PCMBTMUX 0x3F ++#define REG_RX_PATH_SEL 0x43 ++#define REG_VDL_APGA_CTL 0x44 ++#define REG_VIBRA_CTL 0x45 ++#define REG_VIBRA_SET 0x46 ++#define REG_VIBRA_PWM_SET 0x47 ++#define REG_ANAMIC_GAIN 0x48 ++#define REG_MISC_SET_2 0x49 ++ ++#define TWL4030_CACHEREGNUM (REG_MISC_SET_2 + 1) ++ ++/* Bitfield Definitions */ ++ ++/* CODEC_MODE (0x01) Fields */ ++ ++#define APLL_RATE 0xF0 ++#define APLL_RATE_8000 0x00 ++#define APLL_RATE_11025 0x10 ++#define APLL_RATE_12000 0x20 ++#define APLL_RATE_16000 0x40 ++#define APLL_RATE_22050 0x50 ++#define APLL_RATE_24000 0x60 ++#define APLL_RATE_32000 0x80 ++#define APLL_RATE_44100 0x90 ++#define APLL_RATE_48000 0xa0 ++#define SEL_16K 0x04 ++#define CODECPDZ 0x02 ++#define OPT_MODE 0x01 ++ ++/* AUDIO_IF (0x0E) Fields */ ++ ++#define AIF_SLAVE_EN 0x80 ++#define DATA_WIDTH 0x60 ++#define DATA_WIDTH_16S_16W 0x00 ++#define DATA_WIDTH_32S_16W 0x40 ++#define DATA_WIDTH_32S_24W 0x60 ++#define AIF_FORMAT 0x18 ++#define AIF_FORMAT_CODEC 0x00 ++#define AIF_FORMAT_LEFT 0x08 ++#define AIF_FORMAT_RIGHT 0x10 ++#define AIF_FORMAT_TDM 0x18 ++#define AIF_TRI_EN 0x04 ++#define CLK256FS_EN 0x02 ++#define AIF_EN 0x01 ++ ++/* HS_GAIN_SET (0x23) Fields */ ++ ++#define HSR_GAIN 0x0c ++#define HSR_GAIN_PWR_DOWN 0x00 ++#define HSR_GAIN_PLUS_6DB 0x04 ++#define HSR_GAIN_0DB 0x08 ++#define HSR_GAIN_MINUS_6DB 0x0c ++#define HSL_GAIN 0x0c ++#define HSL_GAIN_PWR_DOWN 0x00 ++#define HSL_GAIN_PLUS_6DB 0x01 ++#define HSL_GAIN_0DB 0x02 ++#define HSL_GAIN_MINUS_6DB 0x03 ++ ++/* HS_POPN_SET (0x24) Fields */ ++ ++#define VMID_EN 0x40 ++#define EXTMUTE 0x20 ++#define RAMP_DELAY 0x1C ++#define RAMP_DELAY_20MS 0x00 ++#define RAMP_DELAY_40MS 0x04 ++#define RAMP_DELAY_81MS 0x08 ++#define RAMP_DELAY_161MS 0x0c ++#define RAMP_DELAY_323MS 0x10 ++#define RAMP_DELAY_645MS 0x14 ++#define RAMP_DELAY_1291MS 0x18 ++#define RAMP_DELAY_2581MS 0x1c ++#define RAMP_EN 0x02 ++ ++extern struct snd_soc_codec_dai twl4030_dai; ++extern struct snd_soc_codec_device soc_codec_dev_twl4030; ++ ++#endif /* End of __TWL4030_AUDIO_H__ */ diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch new file mode 100644 index 0000000000..ea8108e090 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for-OMAP3-EVM.patch @@ -0,0 +1,278 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:37 +0000 (-0700) +Subject: ASoC machine driver for OMAP3 EVM +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=2e6af042b4af677e62e32d048e770f6755e67a7f + +ASoC machine driver for OMAP3 EVM + +Add basic audio support for OMAP3 EVM + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig +index cce83e5..a48780a 100644 +--- a/arch/arm/configs/omap3_beagle_defconfig ++++ b/arch/arm/configs/omap3_beagle_defconfig +@@ -735,7 +735,82 @@ CONFIG_FONT_8x16=y + # + # Sound + # +-# CONFIG_SOUND is not set ++CONFIG_SOUND=y ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y ++CONFIG_SND_HWDEP=y ++CONFIG_SND_RAWMIDI=y ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++CONFIG_SND_VERBOSE_PRINTK=y ++CONFIG_SND_DEBUG=y ++CONFIG_SND_DEBUG_DETECT=y ++CONFIG_SND_PCM_XRUN_DEBUG=y ++ ++# ++# Generic devices ++# ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# ALSA ARM devices ++# ++# CONFIG_SND_OMAP_AIC23 is not set ++# CONFIG_SND_OMAP_TSC2101 is not set ++# CONFIG_SND_SX1 is not set ++# CONFIG_SND_OMAP_TSC2102 is not set ++# CONFIG_SND_OMAP24XX_EAC is not set ++ ++# ++# SPI devices ++# ++ ++# ++# USB devices ++# ++CONFIG_SND_USB_AUDIO=y ++# CONFIG_SND_USB_CAIAQ is not set ++ ++# ++# System on Chip audio support ++# ++CONFIG_SND_SOC=y ++ ++# ++# ALSA SoC audio for Freescale SOCs ++# ++ ++# ++# SoC Audio for the Texas Instruments OMAP ++# ++CONFIG_SND_OMAP_SOC=y ++CONFIG_SND_OMAP_SOC_MCBSP=y ++CONFIG_SND_OMAP_SOC_OMAP3BEAGLE=y ++CONFIG_SND_SOC_TWL4030=y ++ ++# ++# Open Sound System ++# ++CONFIG_SOUND_PRIME=y ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++ + # CONFIG_HID_SUPPORT is not set + CONFIG_USB_SUPPORT=y + CONFIG_USB_ARCH_HAS_HCD=y +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index 0230d83..0def5ba 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -16,4 +16,12 @@ config SND_OMAP_SOC_N810 + help + Say Y if you want to add support for SoC audio on Nokia N810. + ++config SND_OMAP_SOC_OMAP3EVM ++ tristate "SoC Audio support for OMAP3 EVM" ++ depends on SND_OMAP_SOC && MACH_OMAP3EVM ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the OMAP3 EVM. ++ + endmenu +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index d8d8d58..985eddc 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -7,5 +7,8 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o + + # OMAP Machine Support + snd-soc-n810-objs := n810.o ++snd-soc-omap3evm-objs := omap3evm.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o ++obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o ++ +diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c +new file mode 100644 +index 0000000..d436bb4 +--- /dev/null ++++ b/sound/soc/omap/omap3evm.c +@@ -0,0 +1,142 @@ ++/* ++ * omap3evm.c -- SoC audio for OMAP3 EVM ++ * ++ * Author: Steve Sakoman <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/gpio.h> ++#include <asm/arch/mcbsp.h> ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3evm_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3evm_ops = { ++ .hw_params = omap3evm_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3evm_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3evm_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3evm = { ++ .name = "omap3evm", ++ .dai_link = &omap3evm_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3evm_snd_devdata = { ++ .machine = &snd_soc_machine_omap3evm, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3evm_snd_device; ++ ++static int __init omap3evm_soc_init(void) ++{ ++ int ret; ++ ++ printk(KERN_INFO "OMAP3 EVM SoC init\n"); ++ if (!machine_is_omap3evm()) { ++ printk(KERN_INFO "Not OMAP3 EVM!\n"); ++ return -ENODEV; ++ } ++ ++ omap3evm_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3evm_snd_device) { ++ printk(KERN_INFO "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3evm_snd_device, &omap3evm_snd_devdata); ++ omap3evm_snd_devdata.dev = &omap3evm_snd_device->dev; ++ *(unsigned int *)omap3evm_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3evm_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_INFO "Unable to add platform device\n"); ++ platform_device_put(omap3evm_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3evm_soc_exit(void) ++{ ++ printk(KERN_INFO "OMAP3 EVM SoC exit\n"); ++ platform_device_unregister(omap3evm_snd_device); ++} ++ ++module_init(omap3evm_soc_init); ++module_exit(omap3evm_soc_exit); ++ ++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 EVM"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch new file mode 100644 index 0000000000..9343a9c59a --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/ASoC-machine-driver-for_OMAP3-Beagle.patch @@ -0,0 +1,279 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Fri, 18 Jul 2008 16:41:49 +0000 (-0700) +Subject: ASoC machine driver for OMAP3 Beagle +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=543a3a0cd4c6f68be6f084ccfe63ec5a514eba59 + +ASoC machine driver for OMAP3 Beagle + +Add basic audio support for OMAP3 Beagle + +Signed-off-by: Steve Sakoman <steve@sakoman.com> +--- + +diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig +index 718c914..4ac730c 100644 +--- a/arch/arm/configs/omap3_evm_defconfig ++++ b/arch/arm/configs/omap3_evm_defconfig +@@ -835,7 +835,82 @@ CONFIG_DUMMY_CONSOLE=y + # + # Sound + # +-# CONFIG_SOUND is not set ++CONFIG_SOUND=y ++ ++# ++# Advanced Linux Sound Architecture ++# ++CONFIG_SND=y ++CONFIG_SND_TIMER=y ++CONFIG_SND_PCM=y ++CONFIG_SND_HWDEP=y ++CONFIG_SND_RAWMIDI=y ++# CONFIG_SND_SEQUENCER is not set ++CONFIG_SND_OSSEMUL=y ++CONFIG_SND_MIXER_OSS=y ++CONFIG_SND_PCM_OSS=y ++CONFIG_SND_PCM_OSS_PLUGINS=y ++# CONFIG_SND_DYNAMIC_MINORS is not set ++CONFIG_SND_SUPPORT_OLD_API=y ++CONFIG_SND_VERBOSE_PROCFS=y ++CONFIG_SND_VERBOSE_PRINTK=y ++CONFIG_SND_DEBUG=y ++CONFIG_SND_DEBUG_DETECT=y ++CONFIG_SND_PCM_XRUN_DEBUG=y ++ ++# ++# Generic devices ++# ++# CONFIG_SND_DUMMY is not set ++# CONFIG_SND_MTPAV is not set ++# CONFIG_SND_SERIAL_U16550 is not set ++# CONFIG_SND_MPU401 is not set ++ ++# ++# ALSA ARM devices ++# ++# CONFIG_SND_OMAP_AIC23 is not set ++# CONFIG_SND_OMAP_TSC2101 is not set ++# CONFIG_SND_SX1 is not set ++# CONFIG_SND_OMAP_TSC2102 is not set ++# CONFIG_SND_OMAP24XX_EAC is not set ++ ++# ++# SPI devices ++# ++ ++# ++# USB devices ++# ++CONFIG_SND_USB_AUDIO=y ++# CONFIG_SND_USB_CAIAQ is not set ++ ++# ++# System on Chip audio support ++# ++CONFIG_SND_SOC=y ++ ++# ++# ALSA SoC audio for Freescale SOCs ++# ++ ++# ++# SoC Audio for the Texas Instruments OMAP ++# ++CONFIG_SND_OMAP_SOC=y ++CONFIG_SND_OMAP_SOC_MCBSP=y ++CONFIG_SND_OMAP_SOC_OMAP3EVM=y ++CONFIG_SND_SOC_TWL4030=y ++ ++# ++# Open Sound System ++# ++CONFIG_SOUND_PRIME=y ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++# CONFIG_HID_DEBUG is not set ++# CONFIG_HIDRAW is not set ++ + # CONFIG_HID_SUPPORT is not set + # CONFIG_USB_SUPPORT is not set + # CONFIG_MMC is not set +diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig +index 0def5ba..8703cea 100644 +--- a/sound/soc/omap/Kconfig ++++ b/sound/soc/omap/Kconfig +@@ -24,4 +24,12 @@ config SND_OMAP_SOC_OMAP3EVM + help + Say Y if you want to add support for SoC audio on the OMAP3 EVM. + ++config SND_OMAP_SOC_OMAP3BEAGLE ++ tristate "SoC Audio support for OMAP3 Beagle" ++ depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE ++ select SND_OMAP_SOC_MCBSP ++ select SND_SOC_TWL4030 ++ help ++ Say Y if you want to add support for SoC audio on the OMAP3 Beagle. ++ + endmenu +diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile +index 985eddc..638a240 100644 +--- a/sound/soc/omap/Makefile ++++ b/sound/soc/omap/Makefile +@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o + # OMAP Machine Support + snd-soc-n810-objs := n810.o + snd-soc-omap3evm-objs := omap3evm.o ++snd-soc-omap3beagle-objs := omap3beagle.o + + obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o + obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o ++obj-$(CONFIG_SND_OMAP_SOC_OMAP3BEAGLE) += snd-soc-omap3beagle.o + +diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c +new file mode 100644 +index 0000000..336d50a +--- /dev/null ++++ b/sound/soc/omap/omap3beagle.c +@@ -0,0 +1,142 @@ ++/* ++ * omap3beagle.c -- SoC audio for OMAP3 Beagle ++ * ++ * Author: Steve Sakoman <steve@sakoman.com> ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * version 2 as published by the Free Software Foundation. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++ * 02110-1301 USA ++ * ++ */ ++ ++#include <linux/clk.h> ++#include <linux/platform_device.h> ++#include <sound/core.h> ++#include <sound/pcm.h> ++#include <sound/soc.h> ++#include <sound/soc-dapm.h> ++ ++#include <asm/mach-types.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/gpio.h> ++#include <asm/arch/mcbsp.h> ++ ++#include "omap-mcbsp.h" ++#include "omap-pcm.h" ++#include "../codecs/twl4030.h" ++ ++static int omap3beagle_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct snd_soc_pcm_runtime *rtd = substream->private_data; ++ struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai; ++ struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai; ++ int ret; ++ ++ /* Set codec DAI configuration */ ++ ret = codec_dai->dai_ops.set_fmt(codec_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set codec DAI configuration\n"); ++ return ret; ++ } ++ ++ /* Set cpu DAI configuration */ ++ ret = cpu_dai->dai_ops.set_fmt(cpu_dai, ++ SND_SOC_DAIFMT_I2S | ++ SND_SOC_DAIFMT_NB_NF | ++ SND_SOC_DAIFMT_CBM_CFM); ++ if (ret < 0) { ++ printk(KERN_INFO "can't set cpu DAI configuration\n"); ++ return ret; ++ } ++ ++ return 0; ++} ++ ++static struct snd_soc_ops omap3beagle_ops = { ++ .hw_params = omap3beagle_hw_params, ++}; ++ ++/* Digital audio interface glue - connects codec <--> CPU */ ++static struct snd_soc_dai_link omap3beagle_dai = { ++ .name = "TWL4030", ++ .stream_name = "TWL4030", ++ .cpu_dai = &omap_mcbsp_dai[0], ++ .codec_dai = &twl4030_dai, ++ .ops = &omap3beagle_ops, ++}; ++ ++/* Audio machine driver */ ++static struct snd_soc_machine snd_soc_machine_omap3beagle = { ++ .name = "omap3beagle", ++ .dai_link = &omap3beagle_dai, ++ .num_links = 1, ++}; ++ ++/* Audio subsystem */ ++static struct snd_soc_device omap3beagle_snd_devdata = { ++ .machine = &snd_soc_machine_omap3beagle, ++ .platform = &omap_soc_platform, ++ .codec_dev = &soc_codec_dev_twl4030, ++}; ++ ++static struct platform_device *omap3beagle_snd_device; ++ ++static int __init omap3beagle_soc_init(void) ++{ ++ int ret; ++ ++ printk(KERN_INFO "OMAP3 Beagle SoC init\n"); ++ if (!machine_is_omap3_beagle()) { ++ printk(KERN_INFO "Not OMAP3 Beagle!\n"); ++ return -ENODEV; ++ } ++ ++ omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); ++ if (!omap3beagle_snd_device) { ++ printk(KERN_INFO "Platform device allocation failed\n"); ++ return -ENOMEM; ++ } ++ ++ platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata); ++ omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev; ++ *(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */ ++ ++ ret = platform_device_add(omap3beagle_snd_device); ++ if (ret) ++ goto err1; ++ ++ return 0; ++ ++err1: ++ printk(KERN_INFO "Unable to add platform device\n"); ++ platform_device_put(omap3beagle_snd_device); ++ ++ return ret; ++} ++ ++static void __exit omap3beagle_soc_exit(void) ++{ ++ printk(KERN_INFO "OMAP3 Beagle SoC exit\n"); ++ platform_device_unregister(omap3beagle_snd_device); ++} ++ ++module_init(omap3beagle_soc_init); ++module_exit(omap3beagle_soc_exit); ++ ++MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); ++MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); ++MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 61fb288135..670cd0f073 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d3b3ae0fe6c71641da19c8de466ec366d39847e3" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r53" +PR = "r54" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -17,7 +17,9 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://0001-omap3-cpuidle.patch;patch=1 \ file://0002-omap3-cpuidle.patch;patch=1 \ file://timer-suppression.patch;patch=1 \ - file://soc.patch;patch=1 \ + file://ASoC-TWL4030-codec-driver.patch;patch=1 \ + file://ASoC-machine-driver-for-OMAP3-EVM.patch;patch=1 \ + file://ASoC-machine-driver-for_OMAP3-Beagle.patch;patch=1 \ file://16bpp.patch;patch=1 \ file://no-empty-flash-warnings.patch;patch=1 \ file://logo_linux_clut224.ppm \ diff --git a/packages/qmake/files/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch index e0ebe512c8..c6f55906bc 100644 --- a/packages/qmake/files/0001-fix-mkspecs.patch +++ b/packages/qmake/files/0001-fix-mkspecs.patch @@ -1,25 +1,13 @@ -From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 -From: Michael Krelin <hacker@klever.net> -Date: Sat, 2 Jun 2007 16:39:58 +0200 -Subject: [PATCH] fix mkspecs - ---- - mkspecs/common/g++.conf | 18 +++++++++--------- - mkspecs/common/linux.conf | 26 +++++++++++++------------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 19:47:02.000000000 +0100 +--- /tmp/g++.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf 2008-07-08 10:34:15.000000000 +0200 @@ -2,12 +2,12 @@ # qmake configuration for common gcc # -QMAKE_CC = gcc -QMAKE_CFLAGS += -pipe -+QMAKE_CC = $(OE_QMAKE_CC) -+QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) ++QMAKE_CC = $(OE_QMAKE_CC) ++QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w @@ -34,8 +22,8 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -QMAKE_CXX = g++ -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -+QMAKE_CXX = $(OE_QMAKE_CXX) -+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) ++QMAKE_CXX = $(OE_QMAKE_CXX) ++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF @@ -46,26 +34,24 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LFLAGS += -+QMAKE_LINK = $(OE_QMAKE_LINK) -+QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -+QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) ++QMAKE_LINK = $(OE_QMAKE_LINK) ++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) ++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ - QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB +@@ -41,7 +41,7 @@ QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += + QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, ++QMAKE_RPATH = -Wl,-rpath-link, QMAKE_PCH_OUTPUT_EXT = .gch -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 19:47:02.000000000 +0100 -@@ -7,26 +7,26 @@ +--- /tmp/linux.conf 2008-07-08 10:32:18.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf 2008-07-08 10:38:37.000000000 +0200 +@@ -7,26 +7,27 @@ QMAKE_INCDIR = QMAKE_LIBDIR = @@ -75,12 +61,13 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+QMAKE_INCDIR_X11 = -+QMAKE_LIBDIR_X11 = ++QMAKE_INCDIR_X11 = ++QMAKE_LIBDIR_X11 = +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -+QMAKE_INCDIR_OPENGL = -+QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = ++ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl @@ -100,10 +87,10 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf -QMAKE_AR = ar cqs +QMAKE_AR = $(OE_QMAKE_AR) cqs + QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = - QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ +@@ -39,7 +40,7 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -112,35 +99,3 @@ Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p - QMAKE_INSTALL_FILE = install -m 644 -p - QMAKE_INSTALL_PROGRAM = install -m 755 -p - --include(unix.conf) -\ No newline at end of file -+include(unix.conf) -Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-04 18:07:53.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 19:47:02.000000000 +0100 -@@ -5,7 +5,7 @@ - MAKEFILE_GENERATOR = UNIX - TEMPLATE = app - CONFIG += qt warn_on release incremental link_prl --QT += core gui -+QT += core gui $$(OE_QMAKE_EXTRA_MODULES) - QMAKE_INCREMENTAL_STYLE = sublib - - include(../common/g++.conf) -Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf 2007-12-26 19:48:20.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf 2007-12-26 19:49:50.000000000 +0100 -@@ -10,6 +10,8 @@ - QMAKE_YACC_HEADER = $base.tab.h - QMAKE_YACC_SOURCE = $base.tab.c - -+QMAKE_RCC = $$(OE_QMAKE_RCC) -+ - QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ; - - QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/ diff --git a/packages/qmake/files/qt-config.patch b/packages/qmake/files/qt-config.patch index b2d86de2c5..3aa041aa51 100644 --- a/packages/qmake/files/qt-config.patch +++ b/packages/qmake/files/qt-config.patch @@ -1,20 +1,14 @@ -Allow to set a qt.conf from the outside using the environment. This allows -to inject new prefixes and other paths into qmake. This is needed when using -the same qmake binary to build qt/x11 and qt/embedded - -Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100 -+++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100 -@@ -42,6 +42,7 @@ - #include "qpointer.h" - #ifdef QT_BUILD_QMAKE +--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 +@@ -47,6 +47,7 @@ + QT_BEGIN_NAMESPACE extern QString qmake_libraryInfoFile(); + QT_END_NAMESPACE +#include <stdlib.h> #else # include "qcoreapplication.h" #endif -@@ -107,6 +108,10 @@ +@@ -113,6 +114,10 @@ #ifdef QT_BUILD_QMAKE if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index f7bdd7836b..642adf874a 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -3,13 +3,15 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" LICENSE = "GPL" -PR = "r2" +PR = "r3" -QTVER = "qtopia-core-opensource-src-${QTVERSION}" +# We call 'moc' during the build +DEPENDS = "uicmoc4-native" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \ +QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ file://0001-fix-mkspecs.patch;patch=1 \ - file://0008-backport-qt-lib-infix.patch;patch=1 \ file://qt-config.patch;patch=1 \ file://use-lflags-last.patch;patch=1 \ file://linux-oe-qmake.conf" @@ -23,6 +25,8 @@ export QTDIR = "${S}" EXTRA_OEMAKE = "-e" do_configure() { + # Make sure we regenerate all Makefiles + find ${S} -name "Makefile" | xargs rm # Install the OE build templates for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ do @@ -43,8 +47,9 @@ do_configure() { export OE_QMAKE_LINK="${CCLD}" export OE_QMAKE_AR="${AR}" export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic4" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" + export QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc4" export OE_QMAKE_RCC="non-existant" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" export OE_QMAKE_RPATH="-Wl,-rpath-link," diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index 0e1aa2c61e..42b24105d8 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,9 +1,10 @@ -QTVERSION="4.3.3" +QTVERSION="4.4.1" FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" -require ${PN}.inc inherit cross +require ${PN}.inc + do_install() { : } diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 705ae14f8d..de941df1df 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -15,6 +15,12 @@ do_stage_append() { cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la + + install -d ${STAGING_DIR_TARGET}/qt4/bin + cp ${STAGING_DIR_NATIVE}/qt4/bin/* ${STAGING_DIR_TARGET}/qt4/bin/ + for qttool in ${STAGING_DIR_TARGET}/qt4/bin/*4 ; do + ln -sf $qttool ${STAGING_DIR_TARGET}/qt4/bin/$(basename $qttool |sed s:4::g) + done } STAGE_TEMP = "${WORKDIR}/temp-staging" diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb index 7eecbd4468..408cf50fbf 100644 --- a/packages/rrdtool/rrdtool_1.0.49.bb +++ b/packages/rrdtool/rrdtool_1.0.49.bb @@ -1,14 +1,16 @@ -DESCRIPTION = "RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average)." -HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool" +DESCRIPTION = "High performance data logging and graphing system for time series data." +HOMEPAGE = "http://oss.oetiker.ch/rrdtool/" +SECTION = "utils" LICENSE = "GPLv2" DEPENDS = "libpng zlib" -PR = "r1" -SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \ +DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" +PR = "r2" +SRC_URI = "http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/rdtool-${PV}.tar.gz \ file://perl-make-options.diff;patch=1;pnum=0" inherit autotools -EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" +EXTRA_OECONF = "rd_cv_ieee_works=yes --enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''" do_install_append() { install -d ${D}${docdir}/rrdtool/ @@ -18,6 +20,8 @@ do_install_append() { mv ${D}/usr/contrib ${D}${docdir}/rrdtool/ } -FILES_${PN} += "${libdir}/perl" +do_stage () { + autotools_stage_all +} -DEPENDS_rddtool-perl = "perl-module-lib perl-module-dynaloader" +FILES_${PN} += "${libdir}/perl" diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc index ab9ab42372..e7b92127a8 100644 --- a/packages/samba/samba.inc +++ b/packages/samba/samba.inc @@ -3,8 +3,8 @@ LICENSE = "GPL" DEPENDS = "readline virtual/libiconv" SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://cifs.patch;patch=1" + file://configure.patch;patch=1" + S = "${WORKDIR}/samba-${PV}/source" inherit autotools diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb index ef1359c79b..fdbc67d1bc 100644 --- a/packages/samba/samba_3.0.23c.bb +++ b/packages/samba/samba_3.0.23c.bb @@ -6,6 +6,7 @@ PR = "r2" SRC_URI += "file://config-lfs.patch;patch=1 \ file://init \ file://quota.patch;patch=1;pnum=0 \ + file://cifs.patch;patch=1 \ " INITSCRIPT_NAME = "samba" diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 265c34bfc2..ea2f024d33 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,10 +1,10 @@ require u-boot.inc -PR="r12" +PR="r13" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_beagleboard = "2d77381a184df7b5017b4a1301d2c02300f3ca3d" -SRCREV_neuros-osd2 = "70ee511d37ca99afee00edc27be36d0af2832bbc" +SRCREV_neuros-osd2 = "a56f1723a6869428996038ff0496a093a04af157" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 8368903277..ad62481800 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -29,6 +29,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \ file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \ file://arm_fix_alignment.patch;patch=1 \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ " #recent versions uclibc require real kernel headers diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 8d7f3111dc..f198ef5240 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -56,6 +56,7 @@ do_compile() { } do_stage() { + install -d ${STAGING_BINDIR}/ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 diff --git a/packages/uicmoc/uicmoc4-native_4.4.0.bb b/packages/uicmoc/uicmoc4-native_4.4.0.bb index 6e13ccbf13..c1282f9805 100644 --- a/packages/uicmoc/uicmoc4-native_4.4.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.4.0.bb @@ -7,4 +7,15 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" inherit native +do_stage() { + install -d ${STAGING_BINDIR}/ + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -m 0755 bin/lrelease ${STAGING_BINDIR}/lrelease4 + install -m 0755 bin/lupdate ${STAGING_BINDIR}/lupdate4 + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ +} |
