diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-07-25 01:10:00 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-07-25 01:10:00 +0000 |
| commit | 3caf3594fb150525211d76b8df7c504534e4c331 (patch) | |
| tree | 07e6960ce15865389949aa4be0369307234268d2 | |
| parent | 1a5fd7ec9efde8a138431e3b470b340ebea6cfe3 (diff) | |
| parent | a3e73146adce111fe67af0886a43acbf7a654bd7 (diff) | |
merge of 'bdbc9f1de56a38029ef1396ead1cd220bf2c07b2'
and 'f960843459326876ef399375d5affaacc45d0a46'
58 files changed, 4771 insertions, 53 deletions
diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index 34f59ef9f7..7dfe459349 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -2,6 +2,7 @@ inherit qmake_base DEPENDS_prepend = "qmake-native " +export QMAKESPEC export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 3026e6f043..004d6e9811 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -111,7 +111,6 @@ PREFERRED_VERSION_gcc-cross-sdk ?= "${ANGSTROM_GCC_VERSION}" PREFERRED_VERSION_gcc-cross-initial ?= "${ANGSTROM_GCC_VERSION}" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom -require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index 75937627cd..05fb2e19e5 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -9,6 +9,10 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" + +module_autoload_cmem = "cmemk phys_start=0x8EA00000 phys_end=0x8F200000 pools=1x3145728,5x829440,1x61440,1x10240" +module_autoload_dsplink = "dsplinkk" + KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" diff --git a/contrib/angstrom/source-mirror.txt b/contrib/angstrom/source-mirror.txt new file mode 100644 index 0000000000..1c480e730d --- /dev/null +++ b/contrib/angstrom/source-mirror.txt @@ -0,0 +1,14 @@ +#To populate the source mirror the autobuilder uses the following command: + +rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -av \ + --exclude "*.md5" \ + --exclude "svn" \ + --exclude "cvs" \ + --exclude "git" \ + --exclude "umac.ko" \ + --exclude "IPL_ixp400NpeLibrary-2_3_2.zip" \ + --exclude "*.lock" \ + --exclude "codec_*" \ + --exclude "dsplink*" \ + --progress + diff --git a/packages/dsplink/codec-engine_2.10.bb b/packages/dsplink/codec-engine_2.10.bb index 21d2684c31..f444c24e1f 100644 --- a/packages/dsplink/codec-engine_2.10.bb +++ b/packages/dsplink/codec-engine_2.10.bb @@ -85,18 +85,17 @@ do_compile() { } -export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a \ - ${S}/packages/ti/sdo/ce/bioslog/lib/*.a \ - ${S}/packages/ti/sdo/ce/video/lib/*.a \ - ${S}/packages/ti/sdo/ce/audio/lib/*.a \ - ${S}/packages/ti/sdo/ce/speech/lib/*.a \ - ${S}/packages/ti/sdo/ce/lib/*.a \ - ${S}/packages/ti/sdo/ce/alg/lib/*.a \ - ${S}/cetools/packages/ti/sdo/fc/dman3/*.a \ - ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a \ - ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a \ - ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a \ - ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a \ +export DSPLIBS = "${S}/packages/ti/sdo/ce/utils/trace/lib/*.a* \ + ${S}/packages/ti/sdo/ce/bioslog/lib/*.a* \ + ${S}/packages/ti/sdo/ce/video/lib/*.a* \ + ${S}/packages/ti/sdo/ce/audio/lib/*.a* \ + ${S}/packages/ti/sdo/ce/speech/lib/*.a* \ + ${S}/packages/ti/sdo/ce/lib/*.a* \ + ${S}/packages/ti/sdo/ce/alg/lib/*.a* \ + ${S}/cetools/packages/ti/sdo/fc/dman3/*.a* \ + ${S}/cetools/packages/ti/sdo/fc/acpy3/*.a* \ + ${S}/packages/ti/sdo/ce/utils/xdm/lib/*.a* \ + ${S}/cetools/packages/ti/sdo/utils/trace/lib/*.a* \ " do_install() { @@ -108,17 +107,23 @@ do_install() { install -d ${D}/${base_sbindir} cd ${D} ; mv apitest apitestd multi_process multi_processd translate translated ${D}/${base_sbindir} + install -d ${D}/${libdir} for i in ${DSPLIBS}; do install -m 0755 $i ${D}/${libdir}/ || true done + install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${D}/${libdir} } do_stage() { install -d ${STAGING_LIBDIR} for i in ${DSPLIBS} ; do - install -m 0755 $i ${STAGING_LIBDIR}/ || true + install -m 0755 $i ${STAGING_LIBDIR}/ + ln -sf ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a470MV ${STAGING_LIBDIR}/$(basename $i | awk -F. '{print $1}').a || true done + + install -m 0755 ${S}/cetools/packages/ti/sdo/linuxutils/cmem/lib/*.a ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/codec-engine} for header in $(find ${S}/cetools/packages/ -name "*.h") ; do diff --git a/packages/h2200-bootloader/h2200-bootloader.bb b/packages/h2200-bootloader/h2200-bootloader.bb index dc7c2277a8..5db3cd058d 100644 --- a/packages/h2200-bootloader/h2200-bootloader.bb +++ b/packages/h2200-bootloader/h2200-bootloader.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Bootloader firmware extractor for the h2200 iPAQ" +RRECOMMENDS_${PN} = "kernel-module-mtdblock" ALLOW_EMPTY = "1" -PR="r2" +PR = "r3" COMPATIBLE_MACHINE = "h2200" #it is a shell script, but lets protect the innocent some more @@ -9,5 +10,6 @@ PACKAGE_ARCH = "h2200" pkg_postinst() { #!/bin/sh mkdir -p /lib/firmware +modprobe mtdblock dd if=/dev/mtdblock0 of=/lib/firmware/h2200_bootloader.bin 2>/dev/null } diff --git a/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/libsdl-image-1.2.3/.mtn2git_empty diff --git a/packages/libsdl/libsdl-image-1.2.3/autotools.patch b/packages/libsdl/libsdl-image-1.2.3/autotools.patch new file mode 100644 index 0000000000..c93a1dd9c3 --- /dev/null +++ b/packages/libsdl/libsdl-image-1.2.3/autotools.patch @@ -0,0 +1,805 @@ +Index: SDL_image-1.2.3/acinclude.m4 +=================================================================== +--- SDL_image-1.2.3.orig/acinclude.m4 2001-11-02 21:39:10.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,608 +0,0 @@ +-# Configure paths for SDL +-# Sam Lantinga 9/21/99 +-# stolen from Manish Singh +-# stolen back from Frank Belew +-# stolen from Manish Singh +-# Shamelessly stolen from Owen Taylor +- +-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +-dnl +-AC_DEFUN(AM_PATH_SDL, +-[dnl +-dnl Get the cflags and libraries from the sdl-config script +-dnl +-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], +- sdl_prefix="$withval", sdl_prefix="") +-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], +- sdl_exec_prefix="$withval", sdl_exec_prefix="") +-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], +- , enable_sdltest=yes) +- +- if test x$sdl_exec_prefix != x ; then +- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config +- fi +- fi +- if test x$sdl_prefix != x ; then +- sdl_args="$sdl_args --prefix=$sdl_prefix" +- if test x${SDL_CONFIG+set} != xset ; then +- SDL_CONFIG=$sdl_prefix/bin/sdl-config +- fi +- fi +- +- AC_REQUIRE([AC_CANONICAL_TARGET]) +- AC_PATH_PROG(SDL_CONFIG, sdl-config, no) +- min_sdl_version=ifelse([$1], ,0.11.0,$1) +- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) +- no_sdl="" +- if test "$SDL_CONFIG" = "no" ; then +- no_sdl=yes +- else +- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` +- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` +- +- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_sdltest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +-dnl +-dnl Now check if the installed SDL is sufficiently new. (Also sanity +-dnl checks the results of sdl-config to some extent +-dnl +- rm -f conf.sdltest +- AC_TRY_RUN([ +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include "SDL.h" +- +-char* +-my_strdup (char *str) +-{ +- char *new_str; +- +- if (str) +- { +- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); +- strcpy (new_str, str); +- } +- else +- new_str = NULL; +- +- return new_str; +-} +- +-int main (int argc, char *argv[]) +-{ +- int major, minor, micro; +- char *tmp_version; +- +- /* This hangs on some systems (?) +- system ("touch conf.sdltest"); +- */ +- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = my_strdup("$min_sdl_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_sdl_version"); +- exit(1); +- } +- +- if (($sdl_major_version > major) || +- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || +- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); +- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); +- printf("*** best to upgrade to the required version.\n"); +- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); +- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); +- printf("*** config.cache before re-running configure\n"); +- return 1; +- } +-} +- +-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_sdl" = x ; then +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$SDL_CONFIG" = "no" ; then +- echo "*** The sdl-config script installed by SDL could not be found" +- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" +- echo "*** your path, or set the SDL_CONFIG environment variable to the" +- echo "*** full path to sdl-config." +- else +- if test -f conf.sdltest ; then +- : +- else +- echo "*** Could not run SDL test program, checking why..." +- CFLAGS="$CFLAGS $SDL_CFLAGS" +- LIBS="$LIBS $SDL_LIBS" +- AC_TRY_LINK([ +-#include <stdio.h> +-#include "SDL.h" +- +-int main(int argc, char *argv[]) +-{ return 0; } +-#undef main +-#define main K_and_R_C_main +-], [ return 0; ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding SDL or finding the wrong" +- echo "*** version of SDL. If it is not finding SDL, you'll need to set your" +- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" +- echo "*** to the installed location Also, make sure you have run ldconfig if that" +- echo "*** is required on your system" +- echo "***" +- echo "*** If you have an old version installed, it is best to remove it, although" +- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], +- [ echo "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means SDL was incorrectly installed" +- echo "*** or that you have moved SDL since it was installed. In the latter case, you" +- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- SDL_CFLAGS="" +- SDL_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(SDL_CFLAGS) +- AC_SUBST(SDL_LIBS) +- rm -f conf.sdltest +-]) +-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- +-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc. +-## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 +-## +-## This program is free software; you can redistribute it and/or modify +-## it under the terms of the GNU General Public License as published by +-## the Free Software Foundation; either version 2 of the License, or +-## (at your option) any later version. +-## +-## 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-## +-## As a special exception to the GNU General Public License, if you +-## distribute this file as part of a program that contains a +-## configuration script generated by Autoconf, you may include it under +-## the same distribution terms that you use for the rest of that program. +- +-# serial 40 AC_PROG_LIBTOOL +-AC_DEFUN(AC_PROG_LIBTOOL, +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +- +-# Save cache, so that ltconfig can load it +-AC_CACHE_SAVE +- +-# Actually configure libtool. ac_aux_dir is where install-sh is found. +-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ +-|| AC_MSG_ERROR([libtool configure failed]) +- +-# Reload cache, that may have been modified by ltconfig +-AC_CACHE_LOAD +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Redirect the config.log output again, so that the ltconfig log is not +-# clobbered by the next message. +-exec 5>>./config.log +-]) +- +-AC_DEFUN(AC_LIBTOOL_SETUP, +-[AC_PREREQ(2.13)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_RANLIB])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +-AC_REQUIRE([AC_PROG_LN_S])dnl +-dnl +- +-case "$target" in +-NONE) lt_target="$host" ;; +-*) lt_target="$target" ;; +-esac +- +-# Check for any special flags to pass to ltconfig. +-libtool_flags="--cache-file=$cache_file" +-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" +-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], +-[libtool_flags="$libtool_flags --enable-dlopen"]) +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[libtool_flags="$libtool_flags --enable-win32-dll"]) +-AC_ARG_ENABLE(libtool-lock, +- [ --disable-libtool-lock avoid locking (might break parallel builds)]) +-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case "$lt_target" in +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +- +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +-]) +-esac +-]) +- +-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support +-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +- +-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's +-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +- +-# AC_ENABLE_SHARED - implement the --enable-shared flag +-# Usage: AC_ENABLE_SHARED[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_SHARED, [dnl +-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(shared, +-changequote(<<, >>)dnl +-<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_shared=yes ;; +-no) enable_shared=no ;; +-*) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl +-]) +- +-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared +-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no)]) +- +-# AC_ENABLE_STATIC - implement the --enable-static flag +-# Usage: AC_ENABLE_STATIC[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_STATIC, [dnl +-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(static, +-changequote(<<, >>)dnl +-<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_static=yes ;; +-no) enable_static=no ;; +-*) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl +-]) +- +-# AC_DISABLE_STATIC - set the default static flag to --disable-static +-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no)]) +- +- +-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag +-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(fast-install, +-changequote(<<, >>)dnl +-<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_fast_install=yes ;; +-no) enable_fast_install=no ;; +-*) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl +-]) +- +-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install +-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no)]) +- +-# AC_PROG_LD - find the path to the GNU or non-GNU linker +-AC_DEFUN(AC_PROG_LD, +-[AC_ARG_WITH(gnu-ld, +-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], +-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$ac_cv_prog_gcc" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by GCC]) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` +- case "$ac_prog" in +- # Accept absolute paths. +-changequote(,)dnl +- [\\/]* | [A-Za-z]:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +-changequote([,])dnl +- # Canonicalize the path of ld +- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(ac_cv_path_LD, +-[if test -z "$LD"; then +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- ac_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then +- test "$with_gnu_ld" != no && break +- else +- test "$with_gnu_ld" != yes && break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-else +- ac_cv_path_LD="$LD" # Let the user override the test with a path. +-fi]) +-LD="$ac_cv_path_LD" +-if test -n "$LD"; then +- AC_MSG_RESULT($LD) +-else +- AC_MSG_RESULT(no) +-fi +-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-AC_PROG_LD_GNU +-]) +- +-AC_DEFUN(AC_PROG_LD_GNU, +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, +-[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then +- ac_cv_prog_gnu_ld=yes +-else +- ac_cv_prog_gnu_ld=no +-fi]) +-]) +- +-# AC_PROG_NM - find the path to a BSD-compatible name lister +-AC_DEFUN(AC_PROG_NM, +-[AC_MSG_CHECKING([for BSD-compatible nm]) +-AC_CACHE_VAL(ac_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- ac_cv_path_NM="$NM" +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -B" +- break +- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -p" +- break +- else +- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm +-fi]) +-NM="$ac_cv_path_NM" +-AC_MSG_RESULT([$NM]) +-]) +- +-# AC_CHECK_LIBM - check for math library +-AC_DEFUN(AC_CHECK_LIBM, +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case "$lt_target" in +-*-*-beos* | *-*-cygwin*) +- # These system don't have libm +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, main, LIBM="-lm") +- ;; +-esac +-]) +- +-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl convenience library and INCLTDL to the include flags for +-# the libltdl header and adds --enable-ltdl-convenience to the +-# configure arguments. Note that LIBLTDL and INCLTDL are not +-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not +-# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed +-# with '${top_builddir}/' and INCLTDL will be prefixed with +-# '${top_srcdir}/' (note the single quotes!). If your package is not +-# flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. +-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case "$enable_ltdl_convenience" in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la +- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +-]) +- +-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl installable library and INCLTDL to the include flags for +-# the libltdl header and adds --enable-ltdl-install to the configure +-# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is +-# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed +-# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will +-# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed +-# with '${top_srcdir}/' (note the single quotes!). If your package is +-# not flat and you're not using automake, define top_builddir and +-# top_srcdir appropriately in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, main, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la +- INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- INCLTDL= +- fi +-]) +- +-dnl old names +-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl +-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl +-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl +- +-dnl This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL])dnl +Index: SDL_image-1.2.3/m4/sdl.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ SDL_image-1.2.3/m4/sdl.m4 2008-07-24 01:32:20.220875043 +0200 +@@ -0,0 +1,174 @@ ++# Configure paths for SDL ++# Sam Lantinga 9/21/99 ++# stolen from Manish Singh ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS ++dnl ++AC_DEFUN(AM_PATH_SDL, ++[dnl ++dnl Get the cflags and libraries from the sdl-config script ++dnl ++AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], ++ sdl_prefix="$withval", sdl_prefix="") ++AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], ++ sdl_exec_prefix="$withval", sdl_exec_prefix="") ++AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], ++ , enable_sdltest=yes) ++ ++ if test x$sdl_exec_prefix != x ; then ++ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config ++ fi ++ fi ++ if test x$sdl_prefix != x ; then ++ sdl_args="$sdl_args --prefix=$sdl_prefix" ++ if test x${SDL_CONFIG+set} != xset ; then ++ SDL_CONFIG=$sdl_prefix/bin/sdl-config ++ fi ++ fi ++ ++ AC_REQUIRE([AC_CANONICAL_TARGET]) ++ AC_PATH_PROG(SDL_CONFIG, sdl-config, no) ++ min_sdl_version=ifelse([$1], ,0.11.0,$1) ++ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) ++ no_sdl="" ++ if test "$SDL_CONFIG" = "no" ; then ++ no_sdl=yes ++ else ++ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` ++ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` ++ ++ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_sdltest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++dnl ++dnl Now check if the installed SDL is sufficiently new. (Also sanity ++dnl checks the results of sdl-config to some extent ++dnl ++ rm -f conf.sdltest ++ AC_TRY_RUN([ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++#include "SDL.h" ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main (int argc, char *argv[]) ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ /* This hangs on some systems (?) ++ system ("touch conf.sdltest"); ++ */ ++ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_sdl_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_sdl_version"); ++ exit(1); ++ } ++ ++ if (($sdl_major_version > major) || ++ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || ++ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); ++ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); ++ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_sdl" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$SDL_CONFIG" = "no" ; then ++ echo "*** The sdl-config script installed by SDL could not be found" ++ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the SDL_CONFIG environment variable to the" ++ echo "*** full path to sdl-config." ++ else ++ if test -f conf.sdltest ; then ++ : ++ else ++ echo "*** Could not run SDL test program, checking why..." ++ CFLAGS="$CFLAGS $SDL_CFLAGS" ++ LIBS="$LIBS $SDL_LIBS" ++ AC_TRY_LINK([ ++#include <stdio.h> ++#include "SDL.h" ++ ++int main(int argc, char *argv[]) ++{ return 0; } ++#undef main ++#define main K_and_R_C_main ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding SDL or finding the wrong" ++ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means SDL was incorrectly installed" ++ echo "*** or that you have moved SDL since it was installed. In the latter case, you" ++ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ SDL_CFLAGS="" ++ SDL_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(SDL_CFLAGS) ++ AC_SUBST(SDL_LIBS) ++ rm -f conf.sdltest ++]) +Index: SDL_image-1.2.3/configure.in +=================================================================== +--- SDL_image-1.2.3.orig/configure.in 2008-07-24 01:34:07.807534207 +0200 ++++ SDL_image-1.2.3/configure.in 2008-07-24 01:34:16.960864590 +0200 +@@ -44,6 +44,8 @@ + AM_INIT_AUTOMAKE(SDL_image, $VERSION) + AM_MAINTAINER_MODE + ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl Check for tools + + AC_LIBTOOL_WIN32_DLL diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb index b35aa3bf1e..1a911f9f62 100644 --- a/packages/libsdl/libsdl-image_1.2.3.bb +++ b/packages/libsdl/libsdl-image_1.2.3.bb @@ -3,15 +3,19 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "zlib libpng jpeg virtual/libsdl" LICENSE = "LGPL" +PR = "r1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://autotools.patch;patch=1 \ + " -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz" S = "${WORKDIR}/SDL_image-${PV}" +export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" + inherit autotools do_stage() { - oe_libinstall -so libSDL_image ${STAGING_LIBDIR} - ln -sf libSDL_image.so ${STAGING_LIBDIR}/libSDL_image-1.2.so - install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h + autotools_stage_all } diff --git a/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libsdl/libsdl-net-1.2.7/.mtn2git_empty diff --git a/packages/libsdl/libsdl-net-1.2.7/libtool2.patch b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch new file mode 100644 index 0000000000..ea6daf7d48 --- /dev/null +++ b/packages/libsdl/libsdl-net-1.2.7/libtool2.patch @@ -0,0 +1,13 @@ +Index: SDL_net-1.2.7/configure.in +=================================================================== +--- SDL_net-1.2.7.orig/configure.in 2007-07-20 14:40:02.000000000 +0200 ++++ SDL_net-1.2.7/configure.in 2008-07-24 00:41:04.282718579 +0200 +@@ -42,6 +42,8 @@ + dnl Setup for automake + AM_INIT_AUTOMAKE(SDL_net, $VERSION) + ++dnl got macros ++AC_CONFIG_MACRO_DIR([acinclude]) + dnl Check for tools + + AC_LIBTOOL_WIN32_DLL diff --git a/packages/libsdl/libsdl-net_1.2.7.bb b/packages/libsdl/libsdl-net_1.2.7.bb index 8149cce379..8cbea5bd01 100644 --- a/packages/libsdl/libsdl-net_1.2.7.bb +++ b/packages/libsdl/libsdl-net_1.2.7.bb @@ -3,16 +3,19 @@ SECTION = "libs/network" PRIORITY = "optional" DEPENDS = "virtual/libsdl" LICENSE = "LGPL" +PR = "r1" + +SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \ + file://libtool2.patch;patch=1 \ + " -SRC_URI = "http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz" S = "${WORKDIR}/SDL_net-${PV}" inherit autotools + EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config" do_stage() { - oe_libinstall -so libSDL_net ${STAGING_LIBDIR} - ln -sf libSDL_net.so ${STAGING_LIBDIR}/libSDL_net-1.2.so - install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h + autotools_stage_all } diff --git a/packages/libsdl/libsdl-ttf_2.0.3.bb b/packages/libsdl/libsdl-ttf_2.0.3.bb index 59e9174fac..250fb698ce 100644 --- a/packages/libsdl/libsdl-ttf_2.0.3.bb +++ b/packages/libsdl/libsdl-ttf_2.0.3.bb @@ -3,6 +3,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libsdl freetype" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \ file://new-freetype-includes.patch;patch=1" @@ -11,7 +12,5 @@ S = "${WORKDIR}/SDL_ttf-${PV}" inherit autotools do_stage() { - oe_libinstall -so libSDL_ttf ${STAGING_LIBDIR} - ln -sf libSDL_ttf.so ${STAGING_LIBDIR}/libSDL_ttf-2.0.so - install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h + autotools_stage_all } diff --git a/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff b/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff new file mode 100644 index 0000000000..f749dbcf5b --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff @@ -0,0 +1,22 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Wed, 16 Jul 2008 19:38:43 +0000 (-0700) +Subject: omap3beagle: set data rate on i2c-1 to 400, since 2600 seems to be +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=12d6504334a830774ff1d42cee4b7296ac9fb7d2 + +omap3beagle: set data rate on i2c-1 to 400, since 2600 seems to be +flakey +--- + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index fdce787..938ad73 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -39,7 +39,7 @@ static struct omap_uart_config omap3_beagle_uart_config __initdata = { + + static int __init omap3_beagle_i2c_init(void) + { +- omap_register_i2c_bus(1, 2600, NULL, 0); ++ omap_register_i2c_bus(1, 400, NULL, 0); + omap_register_i2c_bus(2, 400, NULL, 0); + omap_register_i2c_bus(3, 400, NULL, 0); + return 0; diff --git a/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff b/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff new file mode 100644 index 0000000000..5cd120c544 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff @@ -0,0 +1,38 @@ +From: Purushotam Kumar <purushotam@ti.com> +Date: Fri, 18 Jul 2008 23:28:57 +0000 (-0700) +Subject: OMAP3:devices.c:Enabling 4-bit for SD card +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=6c4d34031c80ca4b50ffe73a4ef7fe197a760a60 + +OMAP3:devices.c:Enabling 4-bit for SD card + +SD card was working in 1-bit mode.This patch will configure SD card in +4-bit mode and hence performance will increase. + +Signed-off-by: Purushotam Kumar <purushotam@ti.com> +Acked-by: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com> +--- + +diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c +index b83f9a6..d0cfceb 100644 +--- a/arch/arm/plat-omap/devices.c ++++ b/arch/arm/plat-omap/devices.c +@@ -296,13 +296,17 @@ static void __init omap_init_mmc(void) + mmc = &mmc_conf->mmc[0]; + + if (cpu_is_omap2430() || cpu_is_omap34xx()) { +- if (mmc->enabled) ++ if (mmc->enabled) { ++ mmc1_data.conf = *mmc; + (void) platform_device_register(&mmc_omap_device1); ++ } + + #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) + mmc = &mmc_conf->mmc[1]; +- if (mmc->enabled) ++ if (mmc->enabled) { ++ mmc2_data.conf = *mmc; + (void) platform_device_register(&mmc_omap_device2); ++ } + #endif + + return; diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff index a17cc52c16..d7dadbc85e 100644 --- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff +++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff @@ -1,7 +1,7 @@ From: Mans Rullgard <mans@mansr.com> Date: Tue, 22 Jul 2008 00:31:11 +0000 (+0100) Subject: ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate() -X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=edc6cd29284f64f524dd410fdc5e6133bc177a8f +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=2b7b958dc79e51127d7a4ecf88ce12dbc6c31426 ARM: OMAP: make dpll4_m4_ck programmable with clk_set_rate() diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff index 99c8f7c285..c8b370da03 100644 --- a/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff +++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff @@ -1,7 +1,7 @@ From: Mans Rullgard <mans@mansr.com> Date: Tue, 22 Jul 2008 00:58:18 +0000 (+0100) Subject: ARM: OMAP: add clk_get_parent() for OMAP2/3 -X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=76a35ce79194b60e3697378e726e1e510c9349d1 +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=e2de5e5578fbaa9b4b75074796da0608fc93e6ae ARM: OMAP: add clk_get_parent() for OMAP2/3 diff --git a/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff new file mode 100644 index 0000000000..f8407fc2d5 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff @@ -0,0 +1,94 @@ +From: Mans Rullgard <mans@mansr.com> +Date: Wed, 23 Jul 2008 08:40:07 +0000 (+0100) +Subject: ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock +X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=01ee28c50701caa94739e764c3dae9298edd8216 + +ARM: OMAP: Set DSS1_ALWON_FCLK to a multiple of the pixel clock + +This sets the DSS1_ALWON_FCLK clock as close as possible to a +multiple of the requested pixel clock, while keeping it below +the 173MHz limit. + +Due to of the structure of the clock tree, dss1_alwon_fck cannot +be set directly, and we must use dpll4_m4_ck instead. + +Signed-off-by: Mans Rullgard <mans@mansr.com> +--- + +diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c +index fd06ca2..e0e8528 100644 +--- a/drivers/video/omap/dispc.c ++++ b/drivers/video/omap/dispc.c +@@ -176,6 +176,7 @@ static struct { + + struct clk *dss_ick, *dss1_fck; + struct clk *dss_54m_fck; ++ struct clk *dpll4_m4_ck; + + enum omapfb_update_mode update_mode; + struct omapfb_device *fbdev; +@@ -738,21 +739,34 @@ static void setup_color_conv_coef(void) + MOD_REG_FLD(at2_reg, (1 << 11), ct->full_range); + } + +-#define MAX_FCK_LCD 173000000 ++#define MAX_FCK 173000000 + + static void calc_ck_div(int is_tft, int pck, int *lck_div, int *pck_div) + { ++ unsigned long prate = clk_get_rate(clk_get_parent(dispc.dpll4_m4_ck)); ++ unsigned long pcd_min = is_tft? 2: 3; ++ unsigned long fck_div; + unsigned long fck, lck; + + pck = max(1, pck); ++ ++ if (pck * pcd_min > MAX_FCK) { ++ dev_warn(dispc.fbdev->dev, "pixclock %d kHz too high.\n", ++ pck / 1000); ++ pck = MAX_FCK / pcd_min; ++ } ++ ++ fck = pck * 2; ++ fck_div = (prate + pck) / fck; ++ if (fck_div > 16) ++ fck_div /= (fck_div + 15) / 16; ++ if (fck_div < 1) ++ fck_div = 1; ++ clk_set_rate(dispc.dpll4_m4_ck, prate / fck_div); + fck = clk_get_rate(dispc.dss1_fck); +- *lck_div = (fck + MAX_FCK_LCD - 1) / MAX_FCK_LCD; +- lck = fck / *lck_div; +- *pck_div = (lck + pck - 1) / pck; +- if (is_tft) +- *pck_div = max(2, *pck_div); +- else +- *pck_div = max(3, *pck_div); ++ ++ *lck_div = 1; ++ *pck_div = (fck + pck - 1) / pck; + if (*pck_div > 255) { + *pck_div = 255; + lck = pck * *pck_div; +@@ -914,11 +928,21 @@ static int get_dss_clocks(void) + return PTR_ERR(dispc.dss_54m_fck); + } + ++ if (IS_ERR((dispc.dpll4_m4_ck = ++ clk_get(dispc.fbdev->dev, "dpll4_m4_ck")))) { ++ dev_err(dispc.fbdev->dev, "can't get dpll4_m4_ck"); ++ clk_put(dispc.dss_ick); ++ clk_put(dispc.dss1_fck); ++ clk_put(dispc.dss_54m_fck); ++ return PTR_ERR(dispc.dss_54m_fck); ++ } ++ + return 0; + } + + static void put_dss_clocks(void) + { ++ clk_put(dispc.dpll4_m4_ck); + clk_put(dispc.dss_54m_fck); + clk_put(dispc.dss1_fck); + clk_put(dispc.dss_ick); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index c6ffd347de..2cba2fe537 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.25+2.6.26-rc9+${PR}+git${SRCREV}" -PR = "r46" +PR = "r48" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ file://defconfig" @@ -23,7 +23,6 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://logo_linux_clut224.ppm \ file://oprofile-0.9.3.armv7.diff;patch=1 \ file://01-fix-timing-print.diff;patch=1 \ - file://02-set-clkseld11.diff;patch=1 \ file://03-enable-overlay-opt.diff;patch=1 \ file://04-use-pcd.diff;patch=1 \ file://05-fix-display-panning.diff;patch=1 \ @@ -43,6 +42,9 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://TWL4030-09.patch;patch=1 \ file://mru-clocks1.diff;patch=1 \ file://mru-clocks2.diff;patch=1 \ + file://mru-clocks3.diff;patch=1 \ + file://4bitmmc.diff;patch=1 \ + file://400khz-i2c.diff;patch=1 \ " SRC_URI_append_omap3evm = " file://no-harry-potter.diff;patch=1 \ diff --git a/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb new file mode 100644 index 0000000000..094c6fd380 --- /dev/null +++ b/packages/lirc/lirc-modules_0.8.3+cvs20080713.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules." +SECTION = "base" +PRIORITY = "optional" +HOMEPAGE = "http://www.lirc.org" +LICENSE = "GPL" +DEPENDS = "virtual/kernel fakeroot-native setserial" +PR = "r0" + +SRCDATE=${@bb.data.getVar('PV', d, 1)[9:]} + +SRC_URI = "cvs://anonymous@lirc.cvs.sourceforge.net/cvsroot/lirc;module=lirc;method=pserver;cvsdate=${SRCDATE}" +S = "${WORKDIR}/lirc" + + +inherit autotools module + +require lirc-config.inc + +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e V=1' -C drivers" + +fakeroot do_install() { + oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install + rm -rf ${D}/dev +} + +# this is for distributions that don't use udev +pkg_postinst_append() { +if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi +} + +FILES_${PN} = "/lib/modules" diff --git a/packages/mono/README b/packages/mono/README index 61bba80c07..7f777718c1 100644 --- a/packages/mono/README +++ b/packages/mono/README @@ -1,6 +1,12 @@ Notes on Mono support in OE. =============================== +Mono 1.9.1 status + +- mono-native and mono-mcs-intermediate error out during compile, but in a + dev shell they compile fine -- very strange. + +=============================== Cross Compiling Mono Cross compiling mono requires a two stage build because the mono mcs directory diff --git a/packages/mono/files/libgc_cppflags.patch b/packages/mono/files/libgc_cppflags.patch new file mode 100644 index 0000000000..d4a51179d1 --- /dev/null +++ b/packages/mono/files/libgc_cppflags.patch @@ -0,0 +1,46 @@ +Index: mono-1.9.1/configure.in +=================================================================== +--- mono-1.9.1.orig/configure.in 2008-07-16 23:37:52.000000000 -0400 ++++ mono-1.9.1/configure.in 2008-07-16 23:38:23.000000000 -0400 +@@ -660,13 +660,6 @@ + ;; + + xincluded) +- AC_CONFIG_SUBDIRS(libgc) +- +- # Pass CPPFLAGS to libgc configure +- # Maybe we should use a separate variable for this to avoid passing useless and +- # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) +- export CPPFLAGS +- + found_boehm=yes + gc_headers=yes + use_included_gc=yes +@@ -714,9 +707,6 @@ + CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG" + fi + +-# tell libgc/configure about what we want +-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args" +- + AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) + AC_SUBST(LIBGC_CFLAGS) + AC_SUBST(LIBGC_LIBS) +@@ -1970,6 +1960,17 @@ + CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS" + fi + ++case "x$gc" in ++ xincluded) ++ # Pass CPPFLAGS to libgc configure ++ # We should use a separate variable for this to avoid passing useless and ++ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64) ++ # This should be executed late so we pick up the final version of CPPFLAGS ++ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\"" ++ AC_CONFIG_SUBDIRS(libgc) ++ ;; ++esac ++ + PREVIEW=yes + AC_ARG_WITH(preview, [ --with-preview=yes,no If you want to install the 2.0 FX preview],[ + if test x$with_preview = xno; then diff --git a/packages/mono/mono-1.9.1/.mtn2git_empty b/packages/mono/mono-1.9.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mono/mono-1.9.1/.mtn2git_empty diff --git a/packages/mono/mono-mcs-intermediate_1.9.1.bb b/packages/mono/mono-mcs-intermediate_1.9.1.bb new file mode 100644 index 0000000000..afa2d2be32 --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.9.1.bb @@ -0,0 +1,15 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.9.1.inc +require mono-mcs-intermediate.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://libgc_cppflags.patch;patch=1" + + diff --git a/packages/mono/mono-native_1.9.1.bb b/packages/mono/mono-native_1.9.1.bb new file mode 100644 index 0000000000..3c18cf7601 --- /dev/null +++ b/packages/mono/mono-native_1.9.1.bb @@ -0,0 +1,27 @@ +require mono_1.9.1.inc +PR = "r3" +DEPENDS = "glib-2.0-native perl-native" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://mono-fix-libdir-path.patch;patch=1 \ + file://libgc_cppflags.patch;patch=1 \ + " + +PARALLEL_MAKE = "" + +inherit native + +do_stage_prepend() { + install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} +} + +do_fix_libtool_name() { + # inherit native will make that all native tools that are being + # built are prefixed with something like "i686-linux-", + # including libtool. Fix up some hardcoded libtool names: + for i in "${S}"/runtime/*-wrapper.in; do + sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}" + done +} +addtask fix_libtool_name after do_patch before do_configure diff --git a/packages/mono/mono_1.9.1-files.inc b/packages/mono/mono_1.9.1-files.inc new file mode 100644 index 0000000000..461eb85ff5 --- /dev/null +++ b/packages/mono/mono_1.9.1-files.inc @@ -0,0 +1,1426 @@ +# This is a generated file, please do not edit directly +# Use collect-files.py instead. -- Henryk <henryk@openmoko.org> +FILES_mono-jit-dbg = "/usr/bin/mono*.mdb \ + /usr/bin/mono*/*.mdb" +FILES_mono-jit = "/usr/bin/mono" +FILES_mono-gac-dbg = "/usr/bin/gacutil*.mdb \ + /usr/bin/gacutil*/*.mdb \ + /usr/lib/mono/1.0/gacutil.exe*.mdb \ + /usr/lib/mono/1.0/gacutil.exe*/*.mdb" +FILES_mono-gac = "/usr/bin/gacutil \ + /usr/lib/mono/1.0/gacutil.exe" +FILES_mono-mjs-dbg = "/usr/bin/mjs*.mdb \ + /usr/bin/mjs*/*.mdb \ + /usr/lib/mono/1.0/mjs.exe*.mdb \ + /usr/lib/mono/1.0/mjs.exe*/*.mdb" +FILES_mono-mjs = "/usr/bin/mjs \ + /usr/lib/mono/1.0/mjs.exe*" +FILES_mono-gmcs-dbg = "/usr/bin/gmcs*.mdb \ + /usr/bin/gmcs*/*.mdb \ + /usr/lib/mono/2.0/gmcs.exe*.mdb \ + /usr/lib/mono/2.0/gmcs.exe*/*.mdb" +FILES_mono-gmcs = "/usr/bin/gmcs \ + /usr/lib/mono/2.0/gmcs.exe*" +FILES_mono-utils-dbg = "/usr/bin/pedump*.mdb \ + /usr/bin/pedump*/*.mdb \ + /usr/bin/monodis*.mdb \ + /usr/bin/monodis*/*.mdb \ + /usr/bin/monograph*.mdb \ + /usr/bin/monograph*/*.mdb \ + /usr/bin/mono-find-provides*.mdb \ + /usr/bin/mono-find-provides*/*.mdb \ + /usr/bin/mono-find-requires*.mdb \ + /usr/bin/mono-find-requires*/*.mdb" +FILES_mono-utils = "/usr/bin/pedump \ + /usr/bin/monodis \ + /usr/bin/monograph \ + /usr/bin/mono-find-provides \ + /usr/bin/mono-find-requires" +FILES_libmono-peapi1.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \ + /usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \ + /usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/PEAPI.dll*.mdb \ + /usr/lib/mono/1.0/PEAPI.dll*/*.mdb" +FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \ + /usr/lib/mono/1.0/PEAPI.dll" +FILES_libmono-cairo1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Mono.Cairo.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Cairo.dll*/*.mdb \ + /usr/lib/pkgconfig/mono-cairo.pc*.mdb \ + /usr/lib/pkgconfig/mono-cairo.pc*/*.mdb" +FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \ + /usr/lib/mono/1.0/Mono.Cairo.dll \ + /usr/lib/pkgconfig/mono-cairo.pc" +FILES_libmono-system-web2.0-cil-dbg = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Web/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Web/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Web/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/2.0/System.Web.dll*.mdb \ + /usr/lib/mono/2.0/System.Web.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Web.Services.dll*.mdb \ + /usr/lib/mono/2.0/System.Web.Services.dll*/*.mdb" +FILES_libmono-system-web2.0-cil = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/ \ + /usr/lib/mono/2.0/System.Web.dll \ + /usr/lib/mono/2.0/System.Web.Services.dll" +FILES_mono-1.0-devel-dbg = "/usr/bin/al*.mdb \ + /usr/bin/al*/*.mdb \ + /usr/bin/caspol*.mdb \ + /usr/bin/caspol*/*.mdb \ + /usr/bin/cert2spc*.mdb \ + /usr/bin/cert2spc*/*.mdb \ + /usr/bin/certmgr*.mdb \ + /usr/bin/certmgr*/*.mdb \ + /usr/bin/chktrust*.mdb \ + /usr/bin/chktrust*/*.mdb \ + /usr/bin/cilc*.mdb \ + /usr/bin/cilc*/*.mdb \ + /usr/bin/disco*.mdb \ + /usr/bin/disco*/*.mdb \ + /usr/bin/dtd2xsd*.mdb \ + /usr/bin/dtd2xsd*/*.mdb \ + /usr/bin/dtd2rng*.mdb \ + /usr/bin/dtd2rng*/*.mdb \ + /usr/bin/genxs*.mdb \ + /usr/bin/genxs*/*.mdb \ + /usr/bin/ilasm*.mdb \ + /usr/bin/ilasm*/*.mdb \ + /usr/bin/installvst*.mdb \ + /usr/bin/installvst*/*.mdb \ + /usr/bin/macpack*.mdb \ + /usr/bin/macpack*/*.mdb \ + /usr/bin/mkbundle*.mdb \ + /usr/bin/mkbundle*/*.mdb \ + /usr/bin/mono-api-diff*.mdb \ + /usr/bin/mono-api-diff*/*.mdb \ + /usr/bin/mono-api-info*.mdb \ + /usr/bin/mono-api-info*/*.mdb \ + /usr/bin/mono-shlib-cop*.mdb \ + /usr/bin/mono-shlib-cop*/*.mdb \ + /usr/bin/mono-xmltool*.mdb \ + /usr/bin/mono-xmltool*/*.mdb \ + /usr/bin/monop*.mdb \ + /usr/bin/monop*/*.mdb \ + /usr/bin/monolinker*.mdb \ + /usr/bin/monolinker*/*.mdb \ + /usr/bin/mozroots*.mdb \ + /usr/bin/mozroots*/*.mdb \ + /usr/bin/permview*.mdb \ + /usr/bin/permview*/*.mdb \ + /usr/bin/resgen*.mdb \ + /usr/bin/resgen*/*.mdb \ + /usr/bin/secutil*.mdb \ + /usr/bin/secutil*/*.mdb \ + /usr/bin/setreg*.mdb \ + /usr/bin/setreg*/*.mdb \ + /usr/bin/signcode*.mdb \ + /usr/bin/signcode*/*.mdb \ + /usr/bin/sn*.mdb \ + /usr/bin/sn*/*.mdb \ + /usr/bin/soapsuds*.mdb \ + /usr/bin/soapsuds*/*.mdb \ + /usr/bin/sqlsharp*.mdb \ + /usr/bin/sqlsharp*/*.mdb \ + /usr/bin/wsdl*.mdb \ + /usr/bin/wsdl*/*.mdb \ + /usr/bin/xsd*.mdb \ + /usr/bin/xsd*/*.mdb \ + /usr/lib/mono/1.0/CorCompare.exe*.mdb \ + /usr/lib/mono/1.0/CorCompare.exe*/*.mdb \ + /usr/lib/mono/1.0/al.exe*.mdb \ + /usr/lib/mono/1.0/al.exe*/*.mdb \ + /usr/lib/mono/1.0/browsercaps-updater.exe*.mdb \ + /usr/lib/mono/1.0/browsercaps-updater.exe*/*.mdb \ + /usr/lib/mono/1.0/caspol.exe*.mdb \ + /usr/lib/mono/1.0/caspol.exe*/*.mdb \ + /usr/lib/mono/1.0/cert2spc.exe*.mdb \ + /usr/lib/mono/1.0/cert2spc.exe*/*.mdb \ + /usr/lib/mono/1.0/certmgr.exe*.mdb \ + /usr/lib/mono/1.0/certmgr.exe*/*.mdb \ + /usr/lib/mono/1.0/chktrust.exe*.mdb \ + /usr/lib/mono/1.0/chktrust.exe*/*.mdb \ + /usr/lib/mono/1.0/cilc.exe*.mdb \ + /usr/lib/mono/1.0/cilc.exe*/*.mdb \ + /usr/lib/mono/1.0/culevel.exe*.mdb \ + /usr/lib/mono/1.0/culevel.exe*/*.mdb \ + /usr/lib/mono/1.0/disco.exe*.mdb \ + /usr/lib/mono/1.0/disco.exe*/*.mdb \ + /usr/lib/mono/1.0/dtd2rng.exe*.mdb \ + /usr/lib/mono/1.0/dtd2rng.exe*/*.mdb \ + /usr/lib/mono/1.0/dtd2xsd.exe*.mdb \ + /usr/lib/mono/1.0/dtd2xsd.exe*/*.mdb \ + /usr/lib/mono/1.0/genxs.exe*.mdb \ + /usr/lib/mono/1.0/genxs.exe*/*.mdb \ + /usr/lib/mono/1.0/ictool.exe*.mdb \ + /usr/lib/mono/1.0/ictool.exe*/*.mdb \ + /usr/lib/mono/1.0/ilasm.exe*.mdb \ + /usr/lib/mono/1.0/ilasm.exe*/*.mdb \ + /usr/lib/mono/1.0/installvst.exe*.mdb \ + /usr/lib/mono/1.0/installvst.exe*/*.mdb \ + /usr/lib/mono/1.0/macpack.exe*.mdb \ + /usr/lib/mono/1.0/macpack.exe*/*.mdb \ + /usr/lib/mono/1.0/makecert.exe*.mdb \ + /usr/lib/mono/1.0/makecert.exe*/*.mdb \ + /usr/lib/mono/1.0/mkbundle.exe*.mdb \ + /usr/lib/mono/1.0/mkbundle.exe*/*.mdb \ + /usr/lib/mono/1.0/mono-api-diff.exe*.mdb \ + /usr/lib/mono/1.0/mono-api-diff.exe*/*.mdb \ + /usr/lib/mono/1.0/mono-api-info.exe*.mdb \ + /usr/lib/mono/1.0/mono-api-info.exe*/*.mdb \ + /usr/lib/mono/1.0/mono-shlib-cop.exe*.mdb \ + /usr/lib/mono/1.0/mono-shlib-cop.exe*/*.mdb \ + /usr/lib/mono/1.0/mono-xmltool.exe*.mdb \ + /usr/lib/mono/1.0/mono-xmltool.exe*/*.mdb \ + /usr/lib/mono/1.0/monolinker.exe*.mdb \ + /usr/lib/mono/1.0/monolinker.exe*/*.mdb \ + /usr/lib/mono/1.0/monop.exe*.mdb \ + /usr/lib/mono/1.0/monop.exe*/*.mdb \ + /usr/lib/mono/1.0/mozroots.exe*.mdb \ + /usr/lib/mono/1.0/mozroots.exe*/*.mdb \ + /usr/lib/mono/1.0/permview.exe*.mdb \ + /usr/lib/mono/1.0/permview.exe*/*.mdb \ + /usr/lib/mono/1.0/resgen.exe*.mdb \ + /usr/lib/mono/1.0/resgen.exe*/*.mdb \ + /usr/lib/mono/1.0/secutil.exe*.mdb \ + /usr/lib/mono/1.0/secutil.exe*/*.mdb \ + /usr/lib/mono/1.0/setreg.exe*.mdb \ + /usr/lib/mono/1.0/setreg.exe*/*.mdb \ + /usr/lib/mono/1.0/signcode.exe*.mdb \ + /usr/lib/mono/1.0/signcode.exe*/*.mdb \ + /usr/lib/mono/1.0/sn.exe*.mdb \ + /usr/lib/mono/1.0/sn.exe*/*.mdb \ + /usr/lib/mono/1.0/soapsuds.exe*.mdb \ + /usr/lib/mono/1.0/soapsuds.exe*/*.mdb \ + /usr/lib/mono/1.0/sqlsharp.exe*.mdb \ + /usr/lib/mono/1.0/sqlsharp.exe*/*.mdb \ + /usr/lib/mono/1.0/wsdl.exe*.mdb \ + /usr/lib/mono/1.0/wsdl.exe*/*.mdb \ + /usr/lib/mono/1.0/xsd.exe*.mdb \ + /usr/lib/mono/1.0/xsd.exe*/*.mdb" +FILES_mono-1.0-devel = "/usr/bin/al \ + /usr/bin/caspol \ + /usr/bin/cert2spc \ + /usr/bin/certmgr \ + /usr/bin/chktrust \ + /usr/bin/cilc \ + /usr/bin/disco \ + /usr/bin/dtd2xsd \ + /usr/bin/dtd2rng \ + /usr/bin/genxs \ + /usr/bin/ilasm \ + /usr/bin/installvst \ + /usr/bin/macpack \ + /usr/bin/mkbundle \ + /usr/bin/mono-api-diff \ + /usr/bin/mono-api-info \ + /usr/bin/mono-shlib-cop \ + /usr/bin/mono-xmltool \ + /usr/bin/monop \ + /usr/bin/monolinker \ + /usr/bin/mozroots \ + /usr/bin/permview \ + /usr/bin/resgen \ + /usr/bin/secutil \ + /usr/bin/setreg \ + /usr/bin/signcode \ + /usr/bin/sn \ + /usr/bin/soapsuds \ + /usr/bin/sqlsharp \ + /usr/bin/wsdl \ + /usr/bin/xsd \ + /usr/lib/mono/1.0/CorCompare.exe \ + /usr/lib/mono/1.0/al.exe \ + /usr/lib/mono/1.0/browsercaps-updater.exe \ + /usr/lib/mono/1.0/caspol.exe \ + /usr/lib/mono/1.0/cert2spc.exe \ + /usr/lib/mono/1.0/certmgr.exe \ + /usr/lib/mono/1.0/chktrust.exe \ + /usr/lib/mono/1.0/cilc.exe \ + /usr/lib/mono/1.0/culevel.exe \ + /usr/lib/mono/1.0/disco.exe \ + /usr/lib/mono/1.0/dtd2rng.exe \ + /usr/lib/mono/1.0/dtd2xsd.exe \ + /usr/lib/mono/1.0/genxs.exe \ + /usr/lib/mono/1.0/ictool.exe \ + /usr/lib/mono/1.0/ilasm.exe \ + /usr/lib/mono/1.0/installvst.exe \ + /usr/lib/mono/1.0/macpack.exe \ + /usr/lib/mono/1.0/makecert.exe \ + /usr/lib/mono/1.0/mkbundle.exe \ + /usr/lib/mono/1.0/mono-api-diff.exe \ + /usr/lib/mono/1.0/mono-api-info.exe \ + /usr/lib/mono/1.0/mono-shlib-cop.exe* \ + /usr/lib/mono/1.0/mono-xmltool.exe \ + /usr/lib/mono/1.0/monolinker.exe \ + /usr/lib/mono/1.0/monop.exe \ + /usr/lib/mono/1.0/mozroots.exe \ + /usr/lib/mono/1.0/permview.exe \ + /usr/lib/mono/1.0/resgen.exe \ + /usr/lib/mono/1.0/secutil.exe \ + /usr/lib/mono/1.0/setreg.exe \ + /usr/lib/mono/1.0/signcode.exe \ + /usr/lib/mono/1.0/sn.exe \ + /usr/lib/mono/1.0/soapsuds.exe \ + /usr/lib/mono/1.0/sqlsharp.exe \ + /usr/lib/mono/1.0/wsdl.exe \ + /usr/lib/mono/1.0/xsd.exe" +FILES_prj2make-sharp-dbg = "/usr/bin/prj2make*.mdb \ + /usr/bin/prj2make*/*.mdb \ + /usr/lib/mono/1.0/prj2make.exe*.mdb \ + /usr/lib/mono/1.0/prj2make.exe*/*.mdb" +FILES_prj2make-sharp = "/usr/bin/prj2make \ + /usr/lib/mono/1.0/prj2make.exe*" +FILES_libmono-accessibility2.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \ + /usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \ + /usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Accessibility.dll*.mdb \ + /usr/lib/mono/2.0/Accessibility.dll*/*.mdb" +FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \ + /usr/lib/mono/2.0/Accessibility.dll" +FILES_libmono-microsoft7.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \ + /usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.VisualC/7.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.VisualC/7.0.*/../.debug/ \ + /usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Vsa/7.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.Vsa/7.0.*/../.debug/ \ + /usr/lib/mono/1.0/Microsoft.JScript.dll*.mdb \ + /usr/lib/mono/1.0/Microsoft.JScript.dll*/*.mdb \ + /usr/lib/mono/1.0/Microsoft.VisualC.dll*.mdb \ + /usr/lib/mono/1.0/Microsoft.VisualC.dll*/*.mdb \ + /usr/lib/mono/1.0/Microsoft.Vsa.dll*.mdb \ + /usr/lib/mono/1.0/Microsoft.Vsa.dll*/*.mdb" +FILES_libmono-microsoft7.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/ \ + /usr/lib/mono/gac/Microsoft.VisualC/7.0.*/ \ + /usr/lib/mono/gac/Microsoft.Vsa/7.0.*/ \ + /usr/lib/mono/1.0/Microsoft.JScript.dll \ + /usr/lib/mono/1.0/Microsoft.VisualC.dll \ + /usr/lib/mono/1.0/Microsoft.Vsa.dll" +FILES_libmono-mozilla0.2-cil-dbg = "/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/../.debug/ \ + /usr/lib/mono/2.0/Mono.Mozilla.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Mozilla.dll*/*.mdb" +FILES_libmono-mozilla0.2-cil = "/usr/lib/mono/gac/Mono.Mozilla/0.2.0.0__*/ \ + /usr/lib/mono/2.0/Mono.Mozilla.dll" +FILES_libmono-security1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Security/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Security/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Security/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Security/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Mono.Security.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Security.dll*/*.mdb" +FILES_libmono-security1.0-cil = "/usr/lib/mono/gac/Mono.Security/1.0.*/ \ + /usr/lib/mono/1.0/Mono.Security.dll" +FILES_libmono-relaxng2.0-cil-dbg = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*.mdb \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/.debug/ \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*.mdb \ + /usr/lib/mono/2.0/Commons.Xml.Relaxng.dll*/*.mdb" +FILES_libmono-relaxng2.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/2.0.*/ \ + /usr/lib/mono/2.0/Commons.Xml.Relaxng.dll" +FILES_libmono-sharpzip2.84-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/.debug/ \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/../.debug/ \ + /usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*.mdb \ + /usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll*/*.mdb" +FILES_libmono-sharpzip2.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.84.*/ \ + /usr/lib/mono/2.0/ICSharpCode.SharpZipLib.dll" +FILES_libmono-system-data2.0-cil-dbg = "/usr/lib/mono/gac/System.Data/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Data/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Data/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Data/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.Data.dll*.mdb \ + /usr/lib/mono/2.0/System.Data.dll*/*.mdb" +FILES_libmono-system-data2.0-cil = "/usr/lib/mono/gac/System.Data/2.0.*/ \ + /usr/lib/mono/2.0/System.Data.dll" +FILES_libmono-cairo2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Cairo/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Cairo/2.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Cairo/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Mono.Cairo.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Cairo.dll*/*.mdb" +FILES_libmono-cairo2.0-cil = "/usr/lib/mono/gac/Mono.Cairo/2.0.*/ \ + /usr/lib/mono/2.0/Mono.Cairo.dll" +FILES_libmono-corlib2.0-cil-dbg = "/usr/lib/mono/2.0/mscorlib.dll*.mdb \ + /usr/lib/mono/2.0/mscorlib.dll*/*.mdb" +FILES_libmono-corlib2.0-cil = "/usr/lib/mono/2.0/mscorlib.dll*" +FILES_libmono-security2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Security/2.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Security/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Security/2.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Security/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Mono.Security.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Security.dll*/*.mdb" +FILES_libmono-security2.0-cil = "/usr/lib/mono/gac/Mono.Security/2.0.*/ \ + /usr/lib/mono/2.0/Mono.Security.dll" +FILES_libmono-microsoft8.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.JScript/8.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.JScript/8.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.JScript/8.0.*/../.debug/ \ + /usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.VisualC/8.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.VisualC/8.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.VisualC/8.0.*/../.debug/ \ + /usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Vsa/8.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Vsa/8.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.Vsa/8.0.*/../.debug/ \ + /usr/lib/mono/2.0/Microsoft.JScript.dll*.mdb \ + /usr/lib/mono/2.0/Microsoft.JScript.dll*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.VisualC.dll*.mdb \ + /usr/lib/mono/2.0/Microsoft.VisualC.dll*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.Vsa.dll*.mdb \ + /usr/lib/mono/2.0/Microsoft.Vsa.dll*/*.mdb" +FILES_libmono-microsoft8.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/8.0.*/ \ + /usr/lib/mono/gac/Microsoft.VisualC/8.0.*/ \ + /usr/lib/mono/gac/Microsoft.Vsa/8.0.*/ \ + /usr/lib/mono/2.0/Microsoft.JScript.dll \ + /usr/lib/mono/2.0/Microsoft.VisualC.dll \ + /usr/lib/mono/2.0/Microsoft.Vsa.dll" +FILES_libmono-corlib1.0-cil-dbg = "/usr/lib/mono/1.0/mscorlib.dll*.mdb \ + /usr/lib/mono/1.0/mscorlib.dll*/*.mdb" +FILES_libmono-corlib1.0-cil = "/usr/lib/mono/1.0/mscorlib.dll*" +FILES_libmono-system-web1.0-cil-dbg = "/usr/lib/mono/gac/System.Web/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Web/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Web/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Web/1.0.*/../.debug/ \ + /usr/lib/mono/gac/System.Web.Services/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Web.Services/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Web.Services/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Web.Services/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Web.dll*.mdb \ + /usr/lib/mono/1.0/System.Web.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Web.Services.dll*.mdb \ + /usr/lib/mono/1.0/System.Web.Services.dll*/*.mdb" +FILES_libmono-system-web1.0-cil = "/usr/lib/mono/gac/System.Web/1.0.*/ \ + /usr/lib/mono/gac/System.Web.Services/1.0.*/ \ + /usr/lib/mono/1.0/System.Web.dll \ + /usr/lib/mono/1.0/System.Web.Services.dll" +FILES_libmono-system-runtime2.0-cil-dbg = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Runtime.*/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Runtime.*/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Runtime.*/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.Runtime.*.dll*.mdb \ + /usr/lib/mono/2.0/System.Runtime.*.dll*/*.mdb" +FILES_libmono-system-runtime2.0-cil = "/usr/lib/mono/gac/System.Runtime.*/2.0.*/ \ + /usr/lib/mono/2.0/System.Runtime.*.dll" +FILES_libmono-cscompmgd8.0-cil-dbg = "/usr/lib/mono/gac/cscompmgd/8.0.*/*.mdb \ + /usr/lib/mono/gac/cscompmgd/8.0.*/*/*.mdb \ + /usr/lib/mono/gac/cscompmgd/8.0.*/.debug/ \ + /usr/lib/mono/gac/cscompmgd/8.0.*/../.debug/ \ + /usr/lib/mono/2.0/cscompmgd.dll*.mdb \ + /usr/lib/mono/2.0/cscompmgd.dll*/*.mdb" +FILES_libmono-cscompmgd8.0-cil = "/usr/lib/mono/gac/cscompmgd/8.0.*/ \ + /usr/lib/mono/2.0/cscompmgd.dll" +FILES_libmono-cscompmgd7.0-cil-dbg = "/usr/lib/mono/gac/cscompmgd/7.0.*/*.mdb \ + /usr/lib/mono/gac/cscompmgd/7.0.*/*/*.mdb \ + /usr/lib/mono/gac/cscompmgd/7.0.*/.debug/ \ + /usr/lib/mono/gac/cscompmgd/7.0.*/../.debug/ \ + /usr/lib/mono/1.0/cscompmgd.dll*.mdb \ + /usr/lib/mono/1.0/cscompmgd.dll*/*.mdb" +FILES_libmono-cscompmgd7.0-cil = "/usr/lib/mono/gac/cscompmgd/7.0.*/ \ + /usr/lib/mono/1.0/cscompmgd.dll" +FILES_libmono-firebirdsql1.7-cil-dbg = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*.mdb \ + /usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/*/*.mdb \ + /usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/.debug/ \ + /usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/../.debug/ \ + /usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*.mdb \ + /usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll*/*.mdb" +FILES_libmono-firebirdsql1.7-cil = "/usr/lib/mono/gac/FirebirdSql.Data.Firebird/1.7.*/ \ + /usr/lib/mono/1.0/FirebirdSql.Data.Firebird.dll" +FILES_mono-jay-dbg = "/usr/bin/jay*.mdb \ + /usr/bin/jay*/*.mdb" +FILES_mono-jay = "/usr/bin/jay" +FILES_libmono-data-tds1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Tds/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Tds/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.Tds/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Mono.Data.Tds.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.Tds.dll*/*.mdb" +FILES_libmono-data-tds1.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/1.0.*/ \ + /usr/lib/mono/1.0/Mono.Data.Tds.dll" +FILES_libmono-sqlite1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Mono.Data.Sqlite.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.Sqlite.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.SqliteClient.dll*/*.mdb" +FILES_libmono-sqlite1.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/1.0.*/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/1.0.*/ \ + /usr/lib/mono/1.0/Mono.Data.Sqlite.dll \ + /usr/lib/mono/1.0/Mono.Data.SqliteClient.dll" +FILES_mono-2.0-devel-dbg = "/etc/mono/mconfig*.mdb \ + /etc/mono/mconfig*/*.mdb \ + /usr/bin/al2*.mdb \ + /usr/bin/al2*/*.mdb \ + /usr/bin/httpcfg*.mdb \ + /usr/bin/httpcfg*/*.mdb \ + /usr/bin/ilasm2*.mdb \ + /usr/bin/ilasm2*/*.mdb \ + /usr/bin/mconfig*.mdb \ + /usr/bin/mconfig*/*.mdb \ + /usr/bin/mkbundle2*.mdb \ + /usr/bin/mkbundle2*/*.mdb \ + /usr/bin/mono-api-info2*.mdb \ + /usr/bin/mono-api-info2*/*.mdb \ + /usr/bin/monop2*.mdb \ + /usr/bin/monop2*/*.mdb \ + /usr/bin/resgen2*.mdb \ + /usr/bin/resgen2*/*.mdb \ + /usr/bin/sgen*.mdb \ + /usr/bin/sgen*/*.mdb \ + /usr/bin/wsdl2*.mdb \ + /usr/bin/wsdl2*/*.mdb \ + /usr/lib/mono/2.0/al.exe*.mdb \ + /usr/lib/mono/2.0/al.exe*/*.mdb \ + /usr/lib/mono/2.0/httpcfg.exe*.mdb \ + /usr/lib/mono/2.0/httpcfg.exe*/*.mdb \ + /usr/lib/mono/2.0/ilasm.exe*.mdb \ + /usr/lib/mono/2.0/ilasm.exe*/*.mdb \ + /usr/lib/mono/2.0/mconfig.exe*.mdb \ + /usr/lib/mono/2.0/mconfig.exe*/*.mdb \ + /usr/lib/mono/2.0/mkbundle.exe*.mdb \ + /usr/lib/mono/2.0/mkbundle.exe*/*.mdb \ + /usr/lib/mono/2.0/mono-api-info.exe*.mdb \ + /usr/lib/mono/2.0/mono-api-info.exe*/*.mdb \ + /usr/lib/mono/2.0/monop.exe*.mdb \ + /usr/lib/mono/2.0/monop.exe*/*.mdb \ + /usr/lib/mono/2.0/resgen.exe*.mdb \ + /usr/lib/mono/2.0/resgen.exe*/*.mdb \ + /usr/lib/mono/2.0/sgen.exe*.mdb \ + /usr/lib/mono/2.0/sgen.exe*/*.mdb \ + /usr/lib/mono/2.0/wsdl.exe*.mdb \ + /usr/lib/mono/2.0/wsdl.exe*/*.mdb" +FILES_mono-2.0-devel = "/etc/mono/mconfig \ + /usr/bin/al2 \ + /usr/bin/httpcfg \ + /usr/bin/ilasm2 \ + /usr/bin/mconfig \ + /usr/bin/mkbundle2 \ + /usr/bin/mono-api-info2 \ + /usr/bin/monop2 \ + /usr/bin/resgen2 \ + /usr/bin/sgen \ + /usr/bin/wsdl2 \ + /usr/lib/mono/2.0/al.exe \ + /usr/lib/mono/2.0/httpcfg.exe \ + /usr/lib/mono/2.0/ilasm.exe \ + /usr/lib/mono/2.0/mconfig.exe \ + /usr/lib/mono/2.0/mkbundle.exe \ + /usr/lib/mono/2.0/mono-api-info.exe \ + /usr/lib/mono/2.0/monop.exe \ + /usr/lib/mono/2.0/resgen.exe \ + /usr/lib/mono/2.0/sgen.exe \ + /usr/lib/mono/2.0/wsdl.exe" +FILES_libmono-relaxng1.0-cil-dbg = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*.mdb \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/.debug/ \ + /usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*.mdb \ + /usr/lib/mono/1.0/Commons.Xml.Relaxng.dll*/*.mdb" +FILES_libmono-relaxng1.0-cil = "/usr/lib/mono/gac/Commons.Xml.Relaxng/1.0.*/ \ + /usr/lib/mono/1.0/Commons.Xml.Relaxng.dll" +FILES_libmono-i18n2.0-cil-dbg = "/usr/lib/mono/gac/I18N*/2.0.*/*.mdb \ + /usr/lib/mono/gac/I18N*/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/I18N*/2.0.*/.debug/ \ + /usr/lib/mono/gac/I18N*/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/I18N*.dll*.mdb \ + /usr/lib/mono/2.0/I18N*.dll*/*.mdb" +FILES_libmono-i18n2.0-cil = "/usr/lib/mono/gac/I18N*/2.0.*/ \ + /usr/lib/mono/2.0/I18N*.dll" +FILES_libmono-accessibility1.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/1.0.*/*.mdb \ + /usr/lib/mono/gac/Accessibility/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Accessibility/1.0.*/.debug/ \ + /usr/lib/mono/gac/Accessibility/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Accessibility.dll*.mdb \ + /usr/lib/mono/1.0/Accessibility.dll*/*.mdb" +FILES_libmono-accessibility1.0-cil = "/usr/lib/mono/gac/Accessibility/1.0.*/ \ + /usr/lib/mono/1.0/Accessibility.dll" +FILES_mono-common-dbg = "/etc/mono*.mdb \ + /etc/mono*/*.mdb \ + /usr/share/mono-1.0/mono/cil/cil-opcodes.xml*.mdb \ + /usr/share/mono-1.0/mono/cil/cil-opcodes.xml*/*.mdb" +FILES_mono-common = "/etc/mono \ + /usr/share/mono-1.0/mono/cil/cil-opcodes.xml" +FILES_libmono-oracle1.0-cil-dbg = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Data.OracleClient/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Data.OracleClient/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Data.OracleClient/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Data.OracleClient.dll*.mdb \ + /usr/lib/mono/1.0/System.Data.OracleClient.dll*/*.mdb" +FILES_libmono-oracle1.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/1.0.*/ \ + /usr/lib/mono/1.0/System.Data.OracleClient.dll" +FILES_libmono-system-data1.0-cil-dbg = "/usr/lib/mono/gac/System.Data/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Data/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Data/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Data/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Data.dll*.mdb \ + /usr/lib/mono/1.0/System.Data.dll*/*.mdb" +FILES_libmono-system-data1.0-cil = "/usr/lib/mono/gac/System.Data/1.0.*/ \ + /usr/lib/mono/1.0/System.Data.dll" +FILES_libmono-bytefx0.7.6.2-cil-dbg = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*.mdb \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/*/*.mdb \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/.debug/ \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/../.debug/ \ + /usr/lib/mono/2.0/ByteFX.Data.dll*.mdb \ + /usr/lib/mono/2.0/ByteFX.Data.dll*/*.mdb" +FILES_libmono-bytefx0.7.6.2-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.2*/ \ + /usr/lib/mono/2.0/ByteFX.Data.dll" +FILES_libmono0-dbg = "/usr/lib/libmono*.so.*.mdb \ + /usr/lib/libmono*.so.*/*.mdb \ + /usr/lib/libMonoPosixHelper.so*.mdb \ + /usr/lib/libMonoPosixHelper.so*/*.mdb \ + /usr/lib/libMonoSupportW.so*.mdb \ + /usr/lib/libMonoSupportW.so*/*.mdb" +FILES_libmono0 = "/usr/lib/libmono*.so.* \ + /usr/lib/libMonoPosixHelper.so \ + /usr/lib/libMonoSupportW.so" +FILES_libmono-dev-dbg = "/usr/lib/libmono*.a*.mdb \ + /usr/lib/libmono*.a*/*.mdb \ + /usr/lib/libMono*.a*.mdb \ + /usr/lib/libMono*.a*/*.mdb \ + /usr/lib/libmono*.so*.mdb \ + /usr/lib/libmono*.so*/*.mdb \ + /usr/lib/libMonoSupportW.a*.mdb \ + /usr/lib/libMonoSupportW.a*/*.mdb \ + /usr/lib/pkgconfig/mono.pc*.mdb \ + /usr/lib/pkgconfig/mono.pc*/*.mdb \ + /usr/lib/pkgconfig/dotnet.pc*.mdb \ + /usr/lib/pkgconfig/dotnet.pc*/*.mdb \ + /usr/include/*.mdb \ + /usr/include/*/*.mdb \ + /usr/include/.debug/ \ + /usr/include/../.debug/" +FILES_libmono-dev = "/usr/lib/libmono*.a \ + /usr/lib/libMono*.a \ + /usr/lib/libmono*.so \ + /usr/lib/libMonoSupportW.a \ + /usr/lib/pkgconfig/mono.pc \ + /usr/lib/pkgconfig/dotnet.pc \ + /usr/include/" +FILES_mono-xbuild-dbg = "/usr/bin/xbuild*.mdb \ + /usr/bin/xbuild*/*.mdb \ + /usr/lib/mono/2.0/xbuild.exe*.mdb \ + /usr/lib/mono/2.0/xbuild.exe*/*.mdb \ + /usr/lib/mono/2.0/xbuild.rsp*.mdb \ + /usr/lib/mono/2.0/xbuild.rsp*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.Build.xsd*.mdb \ + /usr/lib/mono/2.0/Microsoft.Build.xsd*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.CSharp.targets*.mdb \ + /usr/lib/mono/2.0/Microsoft.CSharp.targets*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.Common.tasks*.mdb \ + /usr/lib/mono/2.0/Microsoft.Common.tasks*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.Common.targets*.mdb \ + /usr/lib/mono/2.0/Microsoft.Common.targets*/*.mdb \ + /usr/lib/mono/2.0/Microsoft.VisualBasic.targets*.mdb \ + /usr/lib/mono/2.0/Microsoft.VisualBasic.targets*/*.mdb \ + /usr/lib/mono/2.0/MSBuild/*.mdb \ + /usr/lib/mono/2.0/MSBuild/*/*.mdb \ + /usr/lib/mono/2.0/MSBuild/.debug/ \ + /usr/lib/mono/2.0/MSBuild/../.debug/" +FILES_mono-xbuild = "/usr/bin/xbuild \ + /usr/lib/mono/2.0/xbuild.exe* \ + /usr/lib/mono/2.0/xbuild.rsp \ + /usr/lib/mono/2.0/Microsoft.Build.xsd \ + /usr/lib/mono/2.0/Microsoft.CSharp.targets \ + /usr/lib/mono/2.0/Microsoft.Common.tasks \ + /usr/lib/mono/2.0/Microsoft.Common.targets \ + /usr/lib/mono/2.0/Microsoft.VisualBasic.targets \ + /usr/lib/mono/2.0/MSBuild/" +FILES_libmono-sharpzip0.6-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/.debug/ \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/../.debug/ \ + /usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*.mdb \ + /usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll*/*.mdb" +FILES_libmono-sharpzip0.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.6.*/ \ + /usr/lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll" +FILES_mono-smcs-dbg = "/usr/bin/smcs*.mdb \ + /usr/bin/smcs*/*.mdb \ + /usr/lib/mono/2.1/smcs.exe*.mdb \ + /usr/lib/mono/2.1/smcs.exe*/*.mdb" +FILES_mono-smcs = "/usr/bin/smcs \ + /usr/lib/mono/2.1/smcs.exe*" +FILES_libmono-data-tds2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Tds/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Tds/2.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.Tds/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Mono.Data.Tds.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.Tds.dll*/*.mdb" +FILES_libmono-data-tds2.0-cil = "/usr/lib/mono/gac/Mono.Data.Tds/2.0.*/ \ + /usr/lib/mono/2.0/Mono.Data.Tds.dll" +FILES_libmono-system2.1-cil-dbg = "/usr/lib/mono/gac/System/2.1.0.0__*/*.mdb \ + /usr/lib/mono/gac/System/2.1.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System/2.1.0.0__*/.debug/ \ + /usr/lib/mono/gac/System/2.1.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Core/2.1.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Core/2.1.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Core/2.1.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Core/2.1.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/../.debug/ \ + /usr/lib/mono/2.1/System.dll*.mdb \ + /usr/lib/mono/2.1/System.dll*/*.mdb \ + /usr/lib/mono/2.1/System.Core.dll*.mdb \ + /usr/lib/mono/2.1/System.Core.dll*/*.mdb \ + /usr/lib/mono/2.1/System.Xml.Core.dll*.mdb \ + /usr/lib/mono/2.1/System.Xml.Core.dll*/*.mdb" +FILES_libmono-system2.1-cil = "/usr/lib/mono/gac/System/2.1.0.0__*/ \ + /usr/lib/mono/gac/System.Core/2.1.0.0__*/ \ + /usr/lib/mono/gac/System.Xml.Core/2.1.0.0__*/ \ + /usr/lib/mono/2.1/System.dll \ + /usr/lib/mono/2.1/System.Core.dll \ + /usr/lib/mono/2.1/System.Xml.Core.dll" +FILES_mono-1.0-service-dbg = "/usr/bin/mono-service*.mdb \ + /usr/bin/mono-service*/*.mdb \ + /usr/lib/mono/1.0/mono-service.exe*.mdb \ + /usr/lib/mono/1.0/mono-service.exe*/*.mdb" +FILES_mono-1.0-service = "/usr/bin/mono-service \ + /usr/lib/mono/1.0/mono-service.exe*" +FILES_libmono-system-messaging1.0-cil-dbg = "/usr/lib/mono/gac/System.Messaging/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Messaging/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Messaging/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Messaging/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Messaging.dll*.mdb \ + /usr/lib/mono/1.0/System.Messaging.dll*/*.mdb" +FILES_libmono-system-messaging1.0-cil = "/usr/lib/mono/gac/System.Messaging/1.0.*/ \ + /usr/lib/mono/1.0/System.Messaging.dll" +FILES_libmono-winforms2.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Windows.Forms/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Windows.Forms/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Windows.Forms/2.0.*/../.debug/ \ + /usr/lib/mono/gac/System.Drawing.Design/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Drawing.Design/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Drawing.Design/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Drawing.Design/2.0.*/../.debug/ \ + /usr/lib/mono/gac/System.Design/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Design/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Design/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Design/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.Windows.Forms.dll*.mdb \ + /usr/lib/mono/2.0/System.Windows.Forms.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Drawing.Design.dll*.mdb \ + /usr/lib/mono/2.0/System.Drawing.Design.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Design.dll*.mdb \ + /usr/lib/mono/2.0/System.Design.dll*/*.mdb" +FILES_libmono-winforms2.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/2.0.*/ \ + /usr/lib/mono/gac/System.Drawing.Design/2.0.*/ \ + /usr/lib/mono/gac/System.Design/2.0.*/ \ + /usr/lib/mono/2.0/System.Windows.Forms.dll \ + /usr/lib/mono/2.0/System.Drawing.Design.dll \ + /usr/lib/mono/2.0/System.Design.dll" +FILES_libmono-npgsql1.0-cil-dbg = "/usr/lib/mono/gac/Npgsql/1.0.*/*.mdb \ + /usr/lib/mono/gac/Npgsql/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Npgsql/1.0.*/.debug/ \ + /usr/lib/mono/gac/Npgsql/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Npgsql.dll*.mdb \ + /usr/lib/mono/1.0/Npgsql.dll*/*.mdb" +FILES_libmono-npgsql1.0-cil = "/usr/lib/mono/gac/Npgsql/1.0.*/ \ + /usr/lib/mono/1.0/Npgsql.dll" +FILES_libmono-winforms1.0-cil-dbg = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Windows.Forms/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Windows.Forms/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Windows.Forms/1.0.*/../.debug/ \ + /usr/lib/mono/gac/System.Drawing.Design/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Drawing.Design/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Drawing.Design/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Drawing.Design/1.0.*/../.debug/ \ + /usr/lib/mono/gac/System.Design/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Design/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Design/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Design/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Windows.Forms.dll*.mdb \ + /usr/lib/mono/1.0/System.Windows.Forms.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Drawing.Design.dll*.mdb \ + /usr/lib/mono/1.0/System.Drawing.Design.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Design.dll*.mdb \ + /usr/lib/mono/1.0/System.Design.dll*/*.mdb" +FILES_libmono-winforms1.0-cil = "/usr/lib/mono/gac/System.Windows.Forms/1.0.*/ \ + /usr/lib/mono/gac/System.Drawing.Design/1.0.*/ \ + /usr/lib/mono/gac/System.Design/1.0.*/ \ + /usr/lib/mono/1.0/System.Windows.Forms.dll \ + /usr/lib/mono/1.0/System.Drawing.Design.dll \ + /usr/lib/mono/1.0/System.Design.dll" +FILES_libmono-i18n1.0-cil-dbg = "/usr/lib/mono/gac/I18N*/1.0.*/*.mdb \ + /usr/lib/mono/gac/I18N*/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/I18N*/1.0.*/.debug/ \ + /usr/lib/mono/gac/I18N*/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/I18N*.dll*.mdb \ + /usr/lib/mono/1.0/I18N*.dll*/*.mdb" +FILES_libmono-i18n1.0-cil = "/usr/lib/mono/gac/I18N*/1.0.*/ \ + /usr/lib/mono/1.0/I18N*.dll" +FILES_libmono-bytefx0.7.6.1-cil-dbg = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*.mdb \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/*/*.mdb \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/.debug/ \ + /usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/../.debug/ \ + /usr/lib/mono/1.0/ByteFX.Data.dll*.mdb \ + /usr/lib/mono/1.0/ByteFX.Data.dll*/*.mdb" +FILES_libmono-bytefx0.7.6.1-cil = "/usr/lib/mono/gac/ByteFX.Data/0.7.6.1*/ \ + /usr/lib/mono/1.0/ByteFX.Data.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/*.mdb \ + /usr/lib/mono/gac/IBM.Data.DB2/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/IBM.Data.DB2/1.0.*/.debug/ \ + /usr/lib/mono/gac/IBM.Data.DB2/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/IBM.Data.DB2.dll*.mdb \ + /usr/lib/mono/1.0/IBM.Data.DB2.dll*/*.mdb" +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0.*/ \ + /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-microsoft-build2.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Build.*/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Microsoft.Build.*/2.0.*/.debug/ \ + /usr/lib/mono/gac/Microsoft.Build.*/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Microsoft.Build.*.dll*.mdb \ + /usr/lib/mono/2.0/Microsoft.Build.*.dll*/*.mdb" +FILES_libmono-microsoft-build2.0-cil = "/usr/lib/mono/gac/Microsoft.Build.*/2.0.*/ \ + /usr/lib/mono/2.0/Microsoft.Build.*.dll" +FILES_libmono-system-ldap1.0-cil-dbg = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.DirectoryServices/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.DirectoryServices/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.DirectoryServices/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.DirectoryServices.dll*.mdb \ + /usr/lib/mono/1.0/System.DirectoryServices.dll*/*.mdb" +FILES_libmono-system-ldap1.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/1.0.*/ \ + /usr/lib/mono/1.0/System.DirectoryServices.dll" +FILES_libmono-ldap1.0-cil-dbg = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*.mdb \ + /usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/.debug/ \ + /usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/Novell.Directory.Ldap.dll*.mdb \ + /usr/lib/mono/1.0/Novell.Directory.Ldap.dll*/*.mdb" +FILES_libmono-ldap1.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/1.0.*/ \ + /usr/lib/mono/1.0/Novell.Directory.Ldap.dll" +FILES_libmono-system-ldap2.0-cil-dbg = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.DirectoryServices/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.DirectoryServices/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.DirectoryServices/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.DirectoryServices.dll*.mdb \ + /usr/lib/mono/2.0/System.DirectoryServices.dll*/*.mdb" +FILES_libmono-system-ldap2.0-cil = "/usr/lib/mono/gac/System.DirectoryServices/2.0.*/ \ + /usr/lib/mono/2.0/System.DirectoryServices.dll" +FILES_libmono-system-messaging2.0-cil-dbg = "/usr/lib/mono/gac/System.Messaging/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Messaging/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Messaging/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Messaging/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.Messaging.dll*.mdb \ + /usr/lib/mono/2.0/System.Messaging.dll*/*.mdb" +FILES_libmono-system-messaging2.0-cil = "/usr/lib/mono/gac/System.Messaging/2.0.*/ \ + /usr/lib/mono/2.0/System.Messaging.dll" +FILES_mono-2.0-service-dbg = "/usr/bin/mono-service2*.mdb \ + /usr/bin/mono-service2*/*.mdb \ + /usr/lib/mono/2.0/mono-service.exe*.mdb \ + /usr/lib/mono/2.0/mono-service.exe*/*.mdb" +FILES_mono-2.0-service = "/usr/bin/mono-service2 \ + /usr/lib/mono/2.0/mono-service.exe*" +FILES_libmono-sharpzip0.84-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/.debug/ \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/../.debug/ \ + /usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*.mdb \ + /usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll*/*.mdb" +FILES_libmono-sharpzip0.84-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/0.84.*/ \ + /usr/lib/mono/1.0/ICSharpCode.SharpZipLib.dll" +FILES_libmono-corlib2.1-cil-dbg = "/usr/lib/mono/2.1/mscorlib.dll*.mdb \ + /usr/lib/mono/2.1/mscorlib.dll*/*.mdb" +FILES_libmono-corlib2.1-cil = "/usr/lib/mono/2.1/mscorlib.dll*" +FILES_libmono-sqlite2.0-cil-dbg = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Mono.Data.Sqlite.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.Sqlite.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.SqliteClient.dll*/*.mdb" +FILES_libmono-sqlite2.0-cil = "/usr/lib/mono/gac/Mono.Data.Sqlite/2.0.*/ \ + /usr/lib/mono/gac/Mono.Data.SqliteClient/2.0.*/ \ + /usr/lib/mono/2.0/Mono.Data.Sqlite.dll \ + /usr/lib/mono/2.0/Mono.Data.SqliteClient.dll" +FILES_libmono-ldap2.0-cil-dbg = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*.mdb \ + /usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/.debug/ \ + /usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Novell.Directory.Ldap.dll*.mdb \ + /usr/lib/mono/2.0/Novell.Directory.Ldap.dll*/*.mdb" +FILES_libmono-ldap2.0-cil = "/usr/lib/mono/gac/Novell.Directory.Ldap/2.0.*/ \ + /usr/lib/mono/2.0/Novell.Directory.Ldap.dll" +FILES_libmono-npgsql2.0-cil-dbg = "/usr/lib/mono/gac/Npgsql/2.0.*/*.mdb \ + /usr/lib/mono/gac/Npgsql/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/Npgsql/2.0.*/.debug/ \ + /usr/lib/mono/gac/Npgsql/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/Npgsql.dll*.mdb \ + /usr/lib/mono/2.0/Npgsql.dll*/*.mdb" +FILES_libmono-npgsql2.0-cil = "/usr/lib/mono/gac/Npgsql/2.0.*/ \ + /usr/lib/mono/2.0/Npgsql.dll" +FILES_libmono-system-runtime1.0-cil-dbg = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/*.mdb \ + /usr/lib/mono/gac/System.Runtime.*/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Runtime.*/1.0.*/.debug/ \ + /usr/lib/mono/gac/System.Runtime.*/1.0.*/../.debug/ \ + /usr/lib/mono/1.0/System.Runtime.*.dll*.mdb \ + /usr/lib/mono/1.0/System.Runtime.*.dll*/*.mdb" +FILES_libmono-system-runtime1.0-cil = "/usr/lib/mono/gac/System.Runtime.*/1.0.*/ \ + /usr/lib/mono/1.0/System.Runtime.*.dll" +FILES_libmono-peapi2.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/2.0.*/*.mdb \ + /usr/lib/mono/gac/PEAPI/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/PEAPI/2.0.*/.debug/ \ + /usr/lib/mono/gac/PEAPI/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/PEAPI.dll*.mdb \ + /usr/lib/mono/2.0/PEAPI.dll*/*.mdb" +FILES_libmono-peapi2.0-cil = "/usr/lib/mono/gac/PEAPI/2.0.*/ \ + /usr/lib/mono/2.0/PEAPI.dll" +FILES_libmono-c5-1.0-cil-dbg = "/usr/lib/mono/gac/Mono.C5/1.0.*/*.mdb \ + /usr/lib/mono/gac/Mono.C5/1.0.*/*/*.mdb \ + /usr/lib/mono/gac/Mono.C5/1.0.*/.debug/ \ + /usr/lib/mono/gac/Mono.C5/1.0.*/../.debug/ \ + /usr/lib/mono/2.0/Mono.C5.dll*.mdb \ + /usr/lib/mono/2.0/Mono.C5.dll*/*.mdb" +FILES_libmono-c5-1.0-cil = "/usr/lib/mono/gac/Mono.C5/1.0.*/ \ + /usr/lib/mono/2.0/Mono.C5.dll" +FILES_libmono-oracle2.0-cil-dbg = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*.mdb \ + /usr/lib/mono/gac/System.Data.OracleClient/2.0.*/*/*.mdb \ + /usr/lib/mono/gac/System.Data.OracleClient/2.0.*/.debug/ \ + /usr/lib/mono/gac/System.Data.OracleClient/2.0.*/../.debug/ \ + /usr/lib/mono/2.0/System.Data.OracleClient.dll*.mdb \ + /usr/lib/mono/2.0/System.Data.OracleClient.dll*/*.mdb" +FILES_libmono-oracle2.0-cil = "/usr/lib/mono/gac/System.Data.OracleClient/2.0.*/ \ + /usr/lib/mono/2.0/System.Data.OracleClient.dll" +FILES_libmono-sharpzip2.6-cil-dbg = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/*/*.mdb \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/.debug/ \ + /usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/../.debug/ \ + /usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*.mdb \ + /usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll*/*.mdb" +FILES_libmono-sharpzip2.6-cil = "/usr/lib/mono/gac/ICSharpCode.SharpZipLib/2.6.*/ \ + /usr/lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll" +FILES_mono-mcs-dbg = "/usr/bin/mcs*.mdb \ + /usr/bin/mcs*/*.mdb \ + /usr/lib/mono/1.0/mcs.exe*.mdb \ + /usr/lib/mono/1.0/mcs.exe*/*.mdb" +FILES_mono-mcs = "/usr/bin/mcs \ + /usr/lib/mono/1.0/mcs.exe*" +FILES_libmono-system1.0-cil-dbg = "/usr/lib/mono/1.0/CustomMarshalers.dll*.mdb \ + /usr/lib/mono/1.0/CustomMarshalers.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Configuration.Install.dll*.mdb \ + /usr/lib/mono/1.0/System.Configuration.Install.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Drawing.dll*.mdb \ + /usr/lib/mono/1.0/System.Drawing.dll*/*.mdb \ + /usr/lib/mono/1.0/System.EnterpriseServices.dll*.mdb \ + /usr/lib/mono/1.0/System.EnterpriseServices.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Management.dll*.mdb \ + /usr/lib/mono/1.0/System.Management.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Security.dll*.mdb \ + /usr/lib/mono/1.0/System.Security.dll*/*.mdb \ + /usr/lib/mono/1.0/System.ServiceProcess.dll*.mdb \ + /usr/lib/mono/1.0/System.ServiceProcess.dll*/*.mdb \ + /usr/lib/mono/1.0/System.Xml.dll*.mdb \ + /usr/lib/mono/1.0/System.Xml.dll*/*.mdb \ + /usr/lib/mono/1.0/System.dll*.mdb \ + /usr/lib/mono/1.0/System.dll*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Management/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.Management/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Management/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.Management/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Security/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.Security/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Security/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.Security/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Xml/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System.Xml/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Xml/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System.Xml/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/System/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/System/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/System/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/System/1.0.5000.0__*/../.debug/" +FILES_libmono-system1.0-cil = "/usr/lib/mono/1.0/CustomMarshalers.dll \ + /usr/lib/mono/1.0/System.Configuration.Install.dll \ + /usr/lib/mono/1.0/System.Drawing.dll \ + /usr/lib/mono/1.0/System.EnterpriseServices.dll \ + /usr/lib/mono/1.0/System.Management.dll \ + /usr/lib/mono/1.0/System.Security.dll \ + /usr/lib/mono/1.0/System.ServiceProcess.dll \ + /usr/lib/mono/1.0/System.Xml.dll \ + /usr/lib/mono/1.0/System.dll \ + /usr/lib/mono/gac/CustomMarshalers/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.Configuration.Install/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.Drawing/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.EnterpriseServices/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.Management/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.Security/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.ServiceProcess/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System.Xml/1.0.5000.0__*/ \ + /usr/lib/mono/gac/System/1.0.5000.0__*/" +FILES_libmono-system2.0-cil-dbg = "/usr/lib/mono/2.0/CustomMarshalers.dll*.mdb \ + /usr/lib/mono/2.0/CustomMarshalers.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Configuration.Install.dll*.mdb \ + /usr/lib/mono/2.0/System.Configuration.Install.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Configuration.dll*.mdb \ + /usr/lib/mono/2.0/System.Configuration.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Core.dll*.mdb \ + /usr/lib/mono/2.0/System.Core.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Drawing.dll*.mdb \ + /usr/lib/mono/2.0/System.Drawing.dll*/*.mdb \ + /usr/lib/mono/2.0/System.EnterpriseServices.dll*.mdb \ + /usr/lib/mono/2.0/System.EnterpriseServices.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Management.dll*.mdb \ + /usr/lib/mono/2.0/System.Management.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Security.dll*.mdb \ + /usr/lib/mono/2.0/System.Security.dll*/*.mdb \ + /usr/lib/mono/2.0/System.ServiceProcess.dll*.mdb \ + /usr/lib/mono/2.0/System.ServiceProcess.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Transactions.dll*.mdb \ + /usr/lib/mono/2.0/System.Transactions.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Xml.dll*.mdb \ + /usr/lib/mono/2.0/System.Xml.dll*/*.mdb \ + /usr/lib/mono/2.0/System.Xml.Linq.dll*.mdb \ + /usr/lib/mono/2.0/System.Xml.Linq.dll*/*.mdb \ + /usr/lib/mono/2.0/System.dll*.mdb \ + /usr/lib/mono/2.0/System.dll*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Configuration/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Configuration/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Configuration/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Configuration/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Core/3.5.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Core/3.5.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Core/3.5.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Core/3.5.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Drawing/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Drawing/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Drawing/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Drawing/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Management/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Management/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Management/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Management/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Security/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Security/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Security/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Security/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Transactions/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Transactions/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Transactions/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Transactions/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Xml/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Xml/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Xml/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Xml/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/*.mdb \ + /usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/.debug/ \ + /usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/../.debug/ \ + /usr/lib/mono/gac/System/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/System/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/System/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/System/2.0.0.0__*/../.debug/" +FILES_libmono-system2.0-cil = "/usr/lib/mono/2.0/CustomMarshalers.dll \ + /usr/lib/mono/2.0/System.Configuration.Install.dll \ + /usr/lib/mono/2.0/System.Configuration.dll \ + /usr/lib/mono/2.0/System.Core.dll \ + /usr/lib/mono/2.0/System.Drawing.dll \ + /usr/lib/mono/2.0/System.EnterpriseServices.dll \ + /usr/lib/mono/2.0/System.Management.dll \ + /usr/lib/mono/2.0/System.Security.dll \ + /usr/lib/mono/2.0/System.ServiceProcess.dll \ + /usr/lib/mono/2.0/System.Transactions.dll \ + /usr/lib/mono/2.0/System.Xml.dll \ + /usr/lib/mono/2.0/System.Xml.Linq.dll \ + /usr/lib/mono/2.0/System.dll \ + /usr/lib/mono/gac/CustomMarshalers/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Configuration.Install/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Configuration/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Core/3.5.0.0__*/ \ + /usr/lib/mono/gac/System.Drawing/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.EnterpriseServices/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Management/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Security/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.ServiceProcess/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Transactions/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Xml/2.0.0.0__*/ \ + /usr/lib/mono/gac/System.Xml.Linq/3.5.0.0__*/ \ + /usr/lib/mono/gac/System/2.0.0.0__*/" +FILES_libmono1.0-cil-dbg = "/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll*.mdb \ + /usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Data.SybaseClient.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.SybaseClient.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Data.TdsClient.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.TdsClient.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Data.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Data.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.GetOptions.dll*.mdb \ + /usr/lib/mono/1.0/Mono.GetOptions.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Http.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Http.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Posix.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Posix.dll*/*.mdb \ + /usr/lib/mono/1.0/Mono.Security.Win32.dll*.mdb \ + /usr/lib/mono/1.0/Mono.Security.Win32.dll*/*.mdb \ + /usr/lib/mono/1.0/OpenSystem.C.dll*.mdb \ + /usr/lib/mono/1.0/OpenSystem.C.dll*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Cecil/*.mdb \ + /usr/lib/mono/gac/Mono.Cecil/*/*.mdb \ + /usr/lib/mono/gac/Mono.Cecil/.debug/ \ + /usr/lib/mono/gac/Mono.Cecil/../.debug/ \ + /usr/lib/mono/gac/Mono.Cecil.Mdb/*.mdb \ + /usr/lib/mono/gac/Mono.Cecil.Mdb/*/*.mdb \ + /usr/lib/mono/gac/Mono.Cecil.Mdb/.debug/ \ + /usr/lib/mono/gac/Mono.Cecil.Mdb/../.debug/ \ + /usr/lib/mono/gac/mono-service/1.0.5000.0__*/*.mdb \ + /usr/lib/mono/gac/mono-service/1.0.5000.0__*/*/*.mdb \ + /usr/lib/mono/gac/mono-service/1.0.5000.0__*/.debug/ \ + /usr/lib/mono/gac/mono-service/1.0.5000.0__*/../.debug/ \ + /usr/lib/pkgconfig/cecil.pc*.mdb \ + /usr/lib/pkgconfig/cecil.pc*/*.mdb" +FILES_libmono1.0-cil = "/usr/lib/mono/1.0/Mono.CompilerServices.SymbolWriter.dll \ + /usr/lib/mono/1.0/Mono.Data.SybaseClient.dll \ + /usr/lib/mono/1.0/Mono.Data.TdsClient.dll \ + /usr/lib/mono/1.0/Mono.Data.dll \ + /usr/lib/mono/1.0/Mono.GetOptions.dll \ + /usr/lib/mono/1.0/Mono.Http.dll \ + /usr/lib/mono/1.0/Mono.Posix.dll \ + /usr/lib/mono/1.0/Mono.Security.Win32.dll \ + /usr/lib/mono/1.0/OpenSystem.C.dll \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Data/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.GetOptions/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Posix/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Security.Win32/1.0.5000.0__*/ \ + /usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/ \ + /usr/lib/mono/gac/Mono.Cecil/ \ + /usr/lib/mono/gac/Mono.Cecil.Mdb/ \ + /usr/lib/mono/gac/mono-service/1.0.5000.0__*/ \ + /usr/lib/pkgconfig/cecil.pc" +FILES_libmono2.0-cil-dbg = "/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll*.mdb \ + /usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Data.SybaseClient.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.SybaseClient.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Data.TdsClient.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.TdsClient.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Data.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Data.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.GetOptions.dll*.mdb \ + /usr/lib/mono/2.0/Mono.GetOptions.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Http.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Http.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Posix.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Posix.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Security.Win32.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Security.Win32.dll*/*.mdb \ + /usr/lib/mono/2.0/Mono.Web.dll*.mdb \ + /usr/lib/mono/2.0/Mono.Web.dll*/*.mdb \ + /usr/lib/mono/2.0/OpenSystem.C.dll*.mdb \ + /usr/lib/mono/2.0/OpenSystem.C.dll*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Data/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Data/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Data/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Data/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Http/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Http/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Http/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Http/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/Mono.Web/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/Mono.Web/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/Mono.Web/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/Mono.Web/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/../.debug/ \ + /usr/lib/mono/gac/mono-service/2.0.0.0__*/*.mdb \ + /usr/lib/mono/gac/mono-service/2.0.0.0__*/*/*.mdb \ + /usr/lib/mono/gac/mono-service/2.0.0.0__*/.debug/ \ + /usr/lib/mono/gac/mono-service/2.0.0.0__*/../.debug/" +FILES_libmono2.0-cil = "/usr/lib/mono/2.0/Mono.CompilerServices.SymbolWriter.dll \ + /usr/lib/mono/2.0/Mono.Data.SybaseClient.dll \ + /usr/lib/mono/2.0/Mono.Data.TdsClient.dll \ + /usr/lib/mono/2.0/Mono.Data.dll \ + /usr/lib/mono/2.0/Mono.GetOptions.dll \ + /usr/lib/mono/2.0/Mono.Http.dll \ + /usr/lib/mono/2.0/Mono.Posix.dll \ + /usr/lib/mono/2.0/Mono.Security.Win32.dll \ + /usr/lib/mono/2.0/Mono.Web.dll \ + /usr/lib/mono/2.0/OpenSystem.C.dll \ + /usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Data.SybaseClient/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Data.TdsClient/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Data/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.GetOptions/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Http/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Posix/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Security.Win32/2.0.0.0__*/ \ + /usr/lib/mono/gac/Mono.Web/2.0.0.0__*/ \ + /usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/ \ + /usr/lib/mono/gac/mono-service/2.0.0.0__*/" + +PACKAGES = "mono-jit-dbg \ + mono-jit \ + mono-gac-dbg \ + mono-gac \ + mono-mjs-dbg \ + mono-mjs \ + mono-gmcs-dbg \ + mono-gmcs \ + mono-utils-dbg \ + mono-utils \ + libmono-peapi1.0-cil-dbg \ + libmono-peapi1.0-cil \ + libmono-cairo1.0-cil-dbg \ + libmono-cairo1.0-cil \ + libmono-system-web2.0-cil-dbg \ + libmono-system-web2.0-cil \ + mono-1.0-devel-dbg \ + mono-1.0-devel \ + prj2make-sharp-dbg \ + prj2make-sharp \ + libmono-accessibility2.0-cil-dbg \ + libmono-accessibility2.0-cil \ + libmono-microsoft7.0-cil-dbg \ + libmono-microsoft7.0-cil \ + libmono-mozilla0.2-cil-dbg \ + libmono-mozilla0.2-cil \ + libmono-security1.0-cil-dbg \ + libmono-security1.0-cil \ + libmono-relaxng2.0-cil-dbg \ + libmono-relaxng2.0-cil \ + libmono-sharpzip2.84-cil-dbg \ + libmono-sharpzip2.84-cil \ + libmono-system-data2.0-cil-dbg \ + libmono-system-data2.0-cil \ + libmono-cairo2.0-cil-dbg \ + libmono-cairo2.0-cil \ + libmono-corlib2.0-cil-dbg \ + libmono-corlib2.0-cil \ + libmono-security2.0-cil-dbg \ + libmono-security2.0-cil \ + libmono-microsoft8.0-cil-dbg \ + libmono-microsoft8.0-cil \ + libmono-corlib1.0-cil-dbg \ + libmono-corlib1.0-cil \ + libmono-system-web1.0-cil-dbg \ + libmono-system-web1.0-cil \ + libmono-system-runtime2.0-cil-dbg \ + libmono-system-runtime2.0-cil \ + libmono-cscompmgd8.0-cil-dbg \ + libmono-cscompmgd8.0-cil \ + libmono-cscompmgd7.0-cil-dbg \ + libmono-cscompmgd7.0-cil \ + libmono-firebirdsql1.7-cil-dbg \ + libmono-firebirdsql1.7-cil \ + mono-jay-dbg \ + mono-jay \ + libmono-data-tds1.0-cil-dbg \ + libmono-data-tds1.0-cil \ + libmono-sqlite1.0-cil-dbg \ + libmono-sqlite1.0-cil \ + mono-2.0-devel-dbg \ + mono-2.0-devel \ + libmono-relaxng1.0-cil-dbg \ + libmono-relaxng1.0-cil \ + libmono-i18n2.0-cil-dbg \ + libmono-i18n2.0-cil \ + libmono-accessibility1.0-cil-dbg \ + libmono-accessibility1.0-cil \ + mono-common-dbg \ + mono-common \ + libmono-oracle1.0-cil-dbg \ + libmono-oracle1.0-cil \ + libmono-system-data1.0-cil-dbg \ + libmono-system-data1.0-cil \ + libmono-bytefx0.7.6.2-cil-dbg \ + libmono-bytefx0.7.6.2-cil \ + libmono0-dbg \ + libmono0 \ + libmono-dev-dbg \ + libmono-dev \ + mono-xbuild-dbg \ + mono-xbuild \ + libmono-sharpzip0.6-cil-dbg \ + libmono-sharpzip0.6-cil \ + mono-smcs-dbg \ + mono-smcs \ + libmono-data-tds2.0-cil-dbg \ + libmono-data-tds2.0-cil \ + libmono-system2.1-cil-dbg \ + libmono-system2.1-cil \ + mono-1.0-service-dbg \ + mono-1.0-service \ + libmono-system-messaging1.0-cil-dbg \ + libmono-system-messaging1.0-cil \ + libmono-winforms2.0-cil-dbg \ + libmono-winforms2.0-cil \ + libmono-npgsql1.0-cil-dbg \ + libmono-npgsql1.0-cil \ + libmono-winforms1.0-cil-dbg \ + libmono-winforms1.0-cil \ + libmono-i18n1.0-cil-dbg \ + libmono-i18n1.0-cil \ + libmono-bytefx0.7.6.1-cil-dbg \ + libmono-bytefx0.7.6.1-cil \ + libmono-db2-1.0-cil-dbg \ + libmono-db2-1.0-cil \ + libmono-microsoft-build2.0-cil-dbg \ + libmono-microsoft-build2.0-cil \ + libmono-system-ldap1.0-cil-dbg \ + libmono-system-ldap1.0-cil \ + libmono-ldap1.0-cil-dbg \ + libmono-ldap1.0-cil \ + libmono-system-ldap2.0-cil-dbg \ + libmono-system-ldap2.0-cil \ + libmono-system-messaging2.0-cil-dbg \ + libmono-system-messaging2.0-cil \ + mono-2.0-service-dbg \ + mono-2.0-service \ + libmono-sharpzip0.84-cil-dbg \ + libmono-sharpzip0.84-cil \ + libmono-corlib2.1-cil-dbg \ + libmono-corlib2.1-cil \ + libmono-sqlite2.0-cil-dbg \ + libmono-sqlite2.0-cil \ + libmono-ldap2.0-cil-dbg \ + libmono-ldap2.0-cil \ + libmono-npgsql2.0-cil-dbg \ + libmono-npgsql2.0-cil \ + libmono-system-runtime1.0-cil-dbg \ + libmono-system-runtime1.0-cil \ + libmono-peapi2.0-cil-dbg \ + libmono-peapi2.0-cil \ + libmono-c5-1.0-cil-dbg \ + libmono-c5-1.0-cil \ + libmono-oracle2.0-cil-dbg \ + libmono-oracle2.0-cil \ + libmono-sharpzip2.6-cil-dbg \ + libmono-sharpzip2.6-cil \ + mono-mcs-dbg \ + mono-mcs \ + libmono-system1.0-cil-dbg \ + libmono-system1.0-cil \ + libmono-system2.0-cil-dbg \ + libmono-system2.0-cil \ + libmono1.0-cil-dbg \ + libmono1.0-cil \ + libmono2.0-cil-dbg \ + libmono2.0-cil" diff --git a/packages/mono/mono_1.9.1.bb b/packages/mono/mono_1.9.1.bb new file mode 100644 index 0000000000..4be75d99a7 --- /dev/null +++ b/packages/mono/mono_1.9.1.bb @@ -0,0 +1,80 @@ +require mono_1.9.1.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +DEFAULT_PREFERENCE = "-1" + +PR = "r1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.9.1.inc b/packages/mono/mono_1.9.1.inc new file mode 100644 index 0000000000..120ec70f4d --- /dev/null +++ b/packages/mono/mono_1.9.1.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-1.9.1.tar.bz2 \ + " + +# file://mono-libgc-configure.patch;patch=1" + +S = "${WORKDIR}/mono-1.9.1" + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + diff --git a/packages/mythtv/files/armv5te/.mtn2git_empty b/packages/mythtv/files/armv5te/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/files/armv5te/.mtn2git_empty diff --git a/packages/mythtv/files/armv5te/configh b/packages/mythtv/files/armv5te/configh new file mode 100644 index 0000000000..46c647e2d5 --- /dev/null +++ b/packages/mythtv/files/armv5te/configh @@ -0,0 +1,6 @@ +#define HAVE_LLRINT 1 +#define HAVE_ROUNDF 1 +#define ARCH_ARMV4L 1 +#define ENABLE_ARMV4L 1 +#define HAVE_ARMV5TE 1 +#define ENABLE_ARMV5TE 1 diff --git a/packages/mythtv/files/armv5te/configmak b/packages/mythtv/files/armv5te/configmak new file mode 100644 index 0000000000..aa9978515d --- /dev/null +++ b/packages/mythtv/files/armv5te/configmak @@ -0,0 +1,3 @@ +ARCH_ARMV4L=yes +HAVE_ARMV5TE=yes + diff --git a/packages/mythtv/files/armv6/.mtn2git_empty b/packages/mythtv/files/armv6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/files/armv6/.mtn2git_empty diff --git a/packages/mythtv/files/armv6/configh b/packages/mythtv/files/armv6/configh new file mode 100644 index 0000000000..2301e723d6 --- /dev/null +++ b/packages/mythtv/files/armv6/configh @@ -0,0 +1,8 @@ +#define HAVE_LLRINT 1 +#define HAVE_ROUNDF 1 +#define ARCH_ARMV4L 1 +#define ENABLE_ARMV4L 1 +#define HAVE_ARMV5TE 1 +#define ENABLE_ARMV5TE 1 +#define HAVE_ARMV6 1 +#define ENABLE_ARMV6 1 diff --git a/packages/mythtv/files/armv6/configmak b/packages/mythtv/files/armv6/configmak new file mode 100644 index 0000000000..4db5dc0dfd --- /dev/null +++ b/packages/mythtv/files/armv6/configmak @@ -0,0 +1,3 @@ +ARCH_ARMV4L=yes +HAVE_ARMV5TE=yes +HAVE_ARMV6=yes diff --git a/packages/mythtv/files/armv7a/.mtn2git_empty b/packages/mythtv/files/armv7a/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/files/armv7a/.mtn2git_empty diff --git a/packages/mythtv/files/armv7a/configh b/packages/mythtv/files/armv7a/configh new file mode 100644 index 0000000000..245e40f56a --- /dev/null +++ b/packages/mythtv/files/armv7a/configh @@ -0,0 +1,14 @@ +#define HAVE_LLRINT 1 +#define HAVE_ROUNDF 1 +#define ARCH_ARMV4L 1 +#define ENABLE_ARMV4L 1 +#define HAVE_ARMV5TE 1 +#define ENABLE_ARMV5TE 1 +#define HAVE_ARMV6 1 +#define ENABLE_ARMV6 1 +#define HAVE_ARMV6T2 1 +#define ENABLE_ARMV6T2 1 +#define HAVE_ARMVFP 1 +#define ENABLE_ARMVFP 1 +#define HAVE_NEON 1 +#define ENABLE_NEON 1 diff --git a/packages/mythtv/files/armv7a/configmak b/packages/mythtv/files/armv7a/configmak new file mode 100644 index 0000000000..50d549f794 --- /dev/null +++ b/packages/mythtv/files/armv7a/configmak @@ -0,0 +1,6 @@ +ARCH_ARMV4L=yes +HAVE_ARMV5TE=yes +HAVE_ARMV6=yes +HAVE_ARMV6T2=yes +HAVE_ARMVFP=yes +HAVE_NEON=yes diff --git a/packages/mythtv/files/configh b/packages/mythtv/files/configh new file mode 100644 index 0000000000..2fe7658383 --- /dev/null +++ b/packages/mythtv/files/configh @@ -0,0 +1,2 @@ +#define HAVE_LLRINT 1 +#define HAVE_ROUNDF 1 diff --git a/packages/mythtv/files/configmak b/packages/mythtv/files/configmak new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/files/configmak diff --git a/packages/mythtv/mythtv-0.21/.mtn2git_empty b/packages/mythtv/mythtv-0.21/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mythtv/mythtv-0.21/.mtn2git_empty diff --git a/packages/mythtv/mythtv-0.21/configure.patch b/packages/mythtv/mythtv-0.21/configure.patch new file mode 100644 index 0000000000..3b0b9a313a --- /dev/null +++ b/packages/mythtv/mythtv-0.21/configure.patch @@ -0,0 +1,183 @@ +--- /tmp/configure 2008-06-30 08:40:35.000000000 +0200 ++++ mythtv/configure 2008-07-23 09:51:41.000000000 +0200 +@@ -475,12 +475,13 @@ + } + + check_cmd(){ +- log "$@" ++ echo "Checking $@" ++ log "$@" + "$@" >>$logfile 2>&1 + } + + check_cc(){ +- log check_cc "$@" ++ log check_cc "$@" + cat >$TMPC + log_file $TMPC + check_cmd $cc $CFLAGS $ECFLAGS $OPTFLAGS "$@" -c -o $TMPO $TMPC +@@ -1115,11 +1116,11 @@ + fi + + # machine +-arch=`uname -m` ++disabled cross_compile && arch=`uname -m` + arch_raw="$arch" + cpu="generic" + cpu_override="no" +-processor=`uname -p 2>/dev/null` ++disabled cross_compile && processor=`uname -p 2>/dev/null` + processor_flags="" + tune="generic" + +@@ -1183,7 +1184,7 @@ + lamemp3="yes" + lirc="yes" + mac_bundle="no" +-opengl="yes" ++opengl="no" + v4l="yes" + x11="yes" + x11_include_path="/usr/X11R6/include" +@@ -1212,7 +1213,7 @@ + # build settings + SHFLAGS='-shared -Wl,-soname,$@' + VHOOKSHFLAGS='$(SHFLAGS)' +-LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' ++#LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' + FFSERVERLDFLAGS=-Wl,-E + LDCONFIG="ldconfig" + LIBPREF="lib" +@@ -1707,7 +1708,7 @@ + + has_library() + { +- if test -f /etc/ld.so.conf ; then ++ if test -f /etc/ld.so.conf && disabled cross_compile ; then + LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"` + else + LIBPATHS='' +@@ -1718,7 +1719,7 @@ + LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` " + + # recurse down just one level, should be enough in most cases +- if test -f /etc/ld.so.conf ; then ++ if test -f /etc/ld.so.conf && disabled cross_compile ; then + INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"` + SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'` + for x in $SRCH ; do +@@ -1727,9 +1728,9 @@ + done + fi + +- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " ++ enabled cross_compile || LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` " + +- HAS_IT="no" ++ HAS_IT="yes" + for LIBPATH in $LIBPATHS ; do + if test x`ls $LIBPATH/$1* 2> /dev/null | head -n 1` != x"" ; then + echo "$1 IS at $LIBPATH" +@@ -1745,17 +1746,18 @@ + + has_header() + { +- HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" ++ enabled cross_compile || HPATHS="/usr/local/include /usr/include /usr/include/g++-v3 /usr/X11R6/include" + INCL=`echo $DYLD_LIBRARY_PATH $LD_LIBRARY_PATH | sed s/':'/' '/g` + HPATHS="$HPATHS "$(echo $INCL | sed "s/$libdir_name/include/g") + +- HAS_IT="no" ++ HAS_IT="yes" + for HPATH in $HPATHS ; do + if test x`ls $HPATH/$1* 2> /dev/null | head -n 1` != x"" ; then + HAS_IT="yes" + fi + done +- expr $HAS_IT : "yes" > /dev/null ++ echo "$1: $HAS_IT" ++ expr $HAS_IT : "yes" > /dev/null + } + + append CCONFIG "$compile_type" +@@ -1861,13 +1863,15 @@ + if test x"$cmov" = x"default"; then + disable cmov + if enabled cpu_override; then +- is_x86_cmov_cpu "$cpu" && enable cmov ++ disabled cross_compile && is_x86_cmov_cpu "$cpu" && enable cmov + disabled cmov || is_x86_slow_cmov_cpu "$cpu" || enable fast_cmov + elif expr "$processor_flags" : ".*cmov" > /dev/null ; then +- enable cmov ++ disabled cross_compile && enable cmov + fi + fi + ++enabled cross_compile && disable cmov ++ + # use different default ARCHFLAGS for CPU missing cmov (Via C3 ...) + if test x"$arch" = x"x86_32" && disabled cmov && disabled cpu_override; then + ARCHFLAGS="-march=i586" +@@ -2239,7 +2243,7 @@ + EOF + + if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then +-$TMPE && cpuclipspositive="yes" ++enabled cross_compile || $TMPE && cpuclipspositive="yes" + fi + + # test negative wrap +@@ -2254,7 +2258,7 @@ + EOF + + if $cc $CFLAGS $ECFLAGS -o $TMPE $TMPC 2>/dev/null ; then +-$TMPE && cpuclipsnegative="yes" ++enabled cross_compile || $TMPE && cpuclipsnegative="yes" + fi + + # test for distcc +@@ -2607,33 +2611,9 @@ + check_ldflags -Wl,--warn-common + check_ldflags $LDLATEFLAGS + +-# GCC version +-cat > $TMPC << EOF +-int main(int argc, char **argv) +-{ +- int ret = 0; +- if (argc == 1) +- { +- #if defined(__GNUC__) +- ret = __GNUC__; +- #endif +- } +- else +- { +- #if defined(__GNUC_MINOR__) +- ret = __GNUC_MINOR__; +- #endif +- } +- return ret; +-} +-EOF +- +-if $cc $CFLAGS $TMPC -o $TMPE ; then +- $TMPE +- GCC_MAJOR=$? +- $TMPE "minor" +- GCC_MINOR=$? +-fi ++gcc_version=$($cc -v 2>&1 | grep version | cut -s -d' ' -f 3) ++GCC_MAJOR=$(echo ${gcc_version} | cut -s -d'.' -f1) ++GCC_MINOR=$(echo ${gcc_version} | cut -s -d'.' -f2) + + if enabled symbol_visibility; then + if test x"$GCC_MAJOR" = x"4" ; then +@@ -2727,6 +2707,7 @@ + + check_header GL/gl.h + has_library libGL || has_library libopengl32 || disable opengl ++enabled cross_compile && disable opengl + + VENDOR_XVMC_LIBS="" + check_header X11/extensions/XvMClib.h diff --git a/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff b/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff new file mode 100644 index 0000000000..d0e32eb512 --- /dev/null +++ b/packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff @@ -0,0 +1,1669 @@ +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_arm.c mythtv/libs/libavcodec/armv4l/dsputil_arm.c +--- mythtv.orig/libs/libavcodec/armv4l/dsputil_arm.c 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/dsputil_arm.c 2008-07-24 19:54:00.753198000 +0200 +@@ -19,12 +19,14 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "dsputil.h" ++#include "libavcodec/dsputil.h" + #ifdef HAVE_IPP +-#include "ipp.h" ++#include <ipp.h> + #endif + + extern void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); ++extern void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx); ++extern void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx); + + extern void j_rev_dct_ARM(DCTELEM *data); + extern void simple_idct_ARM(DCTELEM *data); +@@ -41,6 +43,12 @@ + extern void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, + DCTELEM *data); + ++extern void ff_simple_idct_neon(DCTELEM *data); ++extern void ff_simple_idct_put_neon(uint8_t *dest, int line_size, ++ DCTELEM *data); ++extern void ff_simple_idct_add_neon(uint8_t *dest, int line_size, ++ DCTELEM *data); ++ + /* XXX: local hack */ + static void (*ff_put_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); + static void (*ff_add_pixels_clamped)(const DCTELEM *block, uint8_t *pixels, int line_size); +@@ -202,6 +210,24 @@ + } + #endif + ++#ifdef HAVE_ARMV5TE ++static void prefetch_arm(void *mem, int stride, int h) ++{ ++ asm volatile( ++ "1: \n\t" ++ "subs %0, %0, #1 \n\t" ++ "pld [%1] \n\t" ++ "add %1, %1, %2 \n\t" ++ "bgt 1b \n\t" ++ : "+r"(h), "+r"(mem) : "r"(stride)); ++} ++#endif ++ ++int mm_support(void) ++{ ++ return ENABLE_IWMMXT * MM_IWMMXT; ++} ++ + void dsputil_init_armv4l(DSPContext* c, AVCodecContext *avctx) + { + int idct_algo= avctx->idct_algo; +@@ -209,49 +235,60 @@ + ff_put_pixels_clamped = c->put_pixels_clamped; + ff_add_pixels_clamped = c->add_pixels_clamped; + +- if(idct_algo == FF_IDCT_AUTO){ ++ if (avctx->lowres == 0) { ++ if(idct_algo == FF_IDCT_AUTO){ + #if defined(HAVE_IPP) +- idct_algo = FF_IDCT_IPP; ++ idct_algo = FF_IDCT_IPP; ++#elif defined(HAVE_NEON) ++ idct_algo = FF_IDCT_SIMPLENEON; + #elif defined(HAVE_ARMV6) +- idct_algo = FF_IDCT_SIMPLEARMV6; ++ idct_algo = FF_IDCT_SIMPLEARMV6; + #elif defined(HAVE_ARMV5TE) +- idct_algo = FF_IDCT_SIMPLEARMV5TE; ++ idct_algo = FF_IDCT_SIMPLEARMV5TE; + #else +- idct_algo = FF_IDCT_ARM; ++ idct_algo = FF_IDCT_ARM; + #endif +- } ++ } + +- if(idct_algo==FF_IDCT_ARM){ +- c->idct_put= j_rev_dct_ARM_put; +- c->idct_add= j_rev_dct_ARM_add; +- c->idct = j_rev_dct_ARM; +- c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ +- } else if (idct_algo==FF_IDCT_SIMPLEARM){ +- c->idct_put= simple_idct_ARM_put; +- c->idct_add= simple_idct_ARM_add; +- c->idct = simple_idct_ARM; +- c->idct_permutation_type= FF_NO_IDCT_PERM; ++ if(idct_algo==FF_IDCT_ARM){ ++ c->idct_put= j_rev_dct_ARM_put; ++ c->idct_add= j_rev_dct_ARM_add; ++ c->idct = j_rev_dct_ARM; ++ c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ ++ } else if (idct_algo==FF_IDCT_SIMPLEARM){ ++ c->idct_put= simple_idct_ARM_put; ++ c->idct_add= simple_idct_ARM_add; ++ c->idct = simple_idct_ARM; ++ c->idct_permutation_type= FF_NO_IDCT_PERM; + #ifdef HAVE_ARMV6 +- } else if (idct_algo==FF_IDCT_SIMPLEARMV6){ +- c->idct_put= ff_simple_idct_put_armv6; +- c->idct_add= ff_simple_idct_add_armv6; +- c->idct = ff_simple_idct_armv6; +- c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; ++ } else if (idct_algo==FF_IDCT_SIMPLEARMV6){ ++ c->idct_put= ff_simple_idct_put_armv6; ++ c->idct_add= ff_simple_idct_add_armv6; ++ c->idct = ff_simple_idct_armv6; ++ c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; + #endif + #ifdef HAVE_ARMV5TE +- } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){ +- c->idct_put= simple_idct_put_armv5te; +- c->idct_add= simple_idct_add_armv5te; +- c->idct = simple_idct_armv5te; +- c->idct_permutation_type = FF_NO_IDCT_PERM; ++ } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){ ++ c->idct_put= simple_idct_put_armv5te; ++ c->idct_add= simple_idct_add_armv5te; ++ c->idct = simple_idct_armv5te; ++ c->idct_permutation_type = FF_NO_IDCT_PERM; + #endif + #ifdef HAVE_IPP +- } else if (idct_algo==FF_IDCT_IPP){ +- c->idct_put= simple_idct_ipp_put; +- c->idct_add= simple_idct_ipp_add; +- c->idct = simple_idct_ipp; +- c->idct_permutation_type= FF_NO_IDCT_PERM; ++ } else if (idct_algo==FF_IDCT_IPP){ ++ c->idct_put= simple_idct_ipp_put; ++ c->idct_add= simple_idct_ipp_add; ++ c->idct = simple_idct_ipp; ++ c->idct_permutation_type= FF_NO_IDCT_PERM; ++#endif ++#ifdef HAVE_NEON ++ } else if (idct_algo==FF_IDCT_SIMPLENEON){ ++ c->idct_put= ff_simple_idct_put_neon; ++ c->idct_add= ff_simple_idct_add_neon; ++ c->idct = ff_simple_idct_neon; ++ c->idct_permutation_type = FF_NO_IDCT_PERM; + #endif ++ } + } + + c->put_pixels_tab[0][0] = put_pixels16_arm; +@@ -271,7 +308,17 @@ + c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_arm; //OK + c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_arm; + ++#ifdef HAVE_ARMV5TE ++ c->prefetch = prefetch_arm; ++#endif ++ + #ifdef HAVE_IWMMXT + dsputil_init_iwmmxt(c, avctx); + #endif ++#ifdef HAVE_ARMVFP ++ ff_float_init_arm_vfp(c, avctx); ++#endif ++#ifdef HAVE_NEON ++ ff_dsputil_init_neon(c, avctx); ++#endif + } +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_arm_s.S mythtv/libs/libavcodec/armv4l/dsputil_arm_s.S +--- mythtv.orig/libs/libavcodec/armv4l/dsputil_arm_s.S 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/dsputil_arm_s.S 2008-07-24 19:54:00.753198000 +0200 +@@ -19,6 +19,13 @@ + @ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + @ + ++#include "config.h" ++ ++#ifndef HAVE_PLD ++.macro pld reg ++.endm ++#endif ++ + .macro ADJ_ALIGN_QUADWORD_D shift, Rd0, Rd1, Rd2, Rd3, Rn0, Rn1, Rn2, Rn3, Rn4 + mov \Rd0, \Rn0, lsr #(\shift * 8) + mov \Rd1, \Rn1, lsr #(\shift * 8) +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt.c mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt.c +--- mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt.c 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt.c 2008-07-24 19:54:00.753198000 +0200 +@@ -19,10 +19,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "dsputil.h" ++#include "libavcodec/dsputil.h" + + #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt +-#define SET_RND(regd) __asm__ __volatile__ ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); ++#define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); + #define WAVG2B "wavg2b" + #include "dsputil_iwmmxt_rnd.h" + #undef DEF +@@ -30,7 +30,7 @@ + #undef WAVG2B + + #define DEF(x, y) x ## _ ## y ##_iwmmxt +-#define SET_RND(regd) __asm__ __volatile__ ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); ++#define SET_RND(regd) asm volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); + #define WAVG2B "wavg2br" + #include "dsputil_iwmmxt_rnd.h" + #undef DEF +@@ -89,7 +89,7 @@ + { + uint8_t *pixels2 = pixels + line_size; + +- __asm__ __volatile__ ( ++ asm volatile ( + "mov r12, #4 \n\t" + "1: \n\t" + "pld [%[pixels], %[line_size2]] \n\t" +@@ -125,7 +125,7 @@ + + static void clear_blocks_iwmmxt(DCTELEM *blocks) + { +- __asm __volatile( ++ asm volatile( + "wzero wr0 \n\t" + "mov r1, #(128 * 6 / 32) \n\t" + "1: \n\t" +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h +--- mythtv.orig/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/dsputil_iwmmxt_rnd.h 2008-07-24 19:54:01.023198000 +0200 +@@ -19,13 +19,14 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H +-#define FFMPEG_DSPUTIL_IWMMXT_RND_H ++/* This header intentionally has no multiple inclusion guards. It is meant to ++ * be included multiple times and generates different code depending on the ++ * value of certain #defines. */ + + void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) + { + int stride = line_size; +- __asm__ __volatile__ ( ++ asm volatile ( + "and r12, %[pixels], #7 \n\t" + "bic %[pixels], %[pixels], #7 \n\t" + "tmcr wcgr1, r12 \n\t" +@@ -59,7 +60,7 @@ + void DEF(avg, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) + { + int stride = line_size; +- __asm__ __volatile__ ( ++ asm volatile ( + "and r12, %[pixels], #7 \n\t" + "bic %[pixels], %[pixels], #7 \n\t" + "tmcr wcgr1, r12 \n\t" +@@ -101,7 +102,7 @@ + void DEF(put, pixels16)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) + { + int stride = line_size; +- __asm__ __volatile__ ( ++ asm volatile ( + "and r12, %[pixels], #7 \n\t" + "bic %[pixels], %[pixels], #7 \n\t" + "tmcr wcgr1, r12 \n\t" +@@ -141,7 +142,7 @@ + void DEF(avg, pixels16)(uint8_t *block, const uint8_t *pixels, const int line_size, int h) + { + int stride = line_size; +- __asm__ __volatile__ ( ++ asm volatile ( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "pld [%[block]] \n\t" +@@ -200,7 +201,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "and r12, %[pixels], #7 \n\t" +@@ -249,7 +250,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "and r12, %[pixels], #7 \n\t" +@@ -310,7 +311,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "pld [%[block]] \n\t" +@@ -371,7 +372,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "pld [%[block]] \n\t" +@@ -447,7 +448,7 @@ + int stride = line_size; + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "and r12, %[pixels], #7 \n\t" +@@ -501,7 +502,7 @@ + int stride = line_size; + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "and r12, %[pixels], #7 \n\t" +@@ -558,7 +559,7 @@ + int stride = line_size; + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "pld [%[pixels], #32] \n\t" + "and r12, %[pixels], #7 \n\t" +@@ -626,7 +627,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "mov r12, #2 \n\t" + "pld [%[pixels], #32] \n\t" +@@ -720,7 +721,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[pixels]] \n\t" + "mov r12, #2 \n\t" + "pld [%[pixels], #32] \n\t" +@@ -862,7 +863,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[block]] \n\t" + "pld [%[block], #32] \n\t" + "pld [%[pixels]] \n\t" +@@ -966,7 +967,7 @@ + // [wr0 wr1 wr2 wr3] for previous line + // [wr4 wr5 wr6 wr7] for current line + SET_RND(wr15); // =2 for rnd and =1 for no_rnd version +- __asm__ __volatile__( ++ asm volatile( + "pld [%[block]] \n\t" + "pld [%[block], #32] \n\t" + "pld [%[pixels]] \n\t" +@@ -1115,5 +1116,3 @@ + : [line_size]"r"(line_size) + : "r12", "memory"); + } +- +-#endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */ +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/dsputil_neon.c mythtv/libs/libavcodec/armv4l/dsputil_neon.c +--- mythtv.orig/libs/libavcodec/armv4l/dsputil_neon.c 1970-01-01 01:00:00.000000000 +0100 ++++ mythtv/libs/libavcodec/armv4l/dsputil_neon.c 2008-07-24 19:54:01.023198000 +0200 +@@ -0,0 +1,397 @@ ++/* ++ * ARM NEON optimised DSP functions ++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com> ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include <stdint.h> ++ ++#include "libavcodec/avcodec.h" ++#include "libavcodec/dsputil.h" ++ ++extern void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, ++ int h, int x, int y); ++ ++#define PUT_PIXELS_16_X2(vhadd) \ ++ "1: \n\t" \ ++ "vld1.64 {d0,d1,d2}, [%[p]], %[line_size] \n\t" \ ++ "vld1.64 {d4,d5,d6}, [%[p]], %[line_size] \n\t" \ ++ "pld [%[p]] \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ "vext.8 q1, q0, q1, #1 \n\t" \ ++ "vext.8 q3, q2, q3, #1 \n\t" \ ++ vhadd".u8 q0, q0, q1 \n\t" \ ++ vhadd".u8 q2, q2, q3 \n\t" \ ++ "vst1.64 {d0,d1}, [%[b],:64], %[line_size] \n\t" \ ++ "vst1.64 {d4,d5}, [%[b],:64], %[line_size] \n\t" \ ++ "bne 1b \n\t" ++ ++#define PUT_PIXELS_16_Y2(vhadd) \ ++ "add %[p1], %[p0], %[line_size] \n\t" \ ++ "lsl %[l2], %[line_size], #1 \n\t" \ ++ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \ ++ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \ ++ "1: \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ vhadd".u8 q2, q0, q1 \n\t" \ ++ "vst1.64 {d4,d5}, [%[b],:128], %[line_size] \n\t" \ ++ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \ ++ vhadd".u8 q2, q0, q1 \n\t" \ ++ "vst1.64 {d4,d5}, [%[b],:128], %[line_size] \n\t" \ ++ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \ ++ "bne 1b \n\t" ++ ++#define PUT_PIXELS_16_XY2(vshrn, no_rnd) \ ++ "lsl %[l2], %[line_size], #1 \n\t" \ ++ "add %[p1], %[p0], %[line_size] \n\t" \ ++ "vld1.64 {d0,d1,d2}, [%[p0]], %[l2] \n\t" \ ++ "vld1.64 {d4,d5,d6}, [%[p1]], %[l2] \n\t" \ ++ "pld [%[p0]] \n\t" \ ++ "pld [%[p1]] \n\t" \ ++ "vext.8 q1, q0, q1, #1 \n\t" \ ++ "vext.8 q3, q2, q3, #1 \n\t" \ ++ "vaddl.u8 q8, d0, d2 \n\t" \ ++ "vaddl.u8 q10, d1, d3 \n\t" \ ++ "vaddl.u8 q9, d4, d6 \n\t" \ ++ "vaddl.u8 q11, d5, d7 \n\t" \ ++ "1: \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ "vld1.64 {d0,d1,d2}, [%[p0]], %[l2] \n\t" \ ++ "vadd.u16 q12, q8, q9 \n\t" \ ++ "pld [%[p0]] \n\t" \ ++ no_rnd "vadd.u16 q12, q12, q13 \n\t" \ ++ "vext.8 q15, q0, q1, #1 \n\t" \ ++ "vadd.u16 q1, q10, q11 \n\t" \ ++ vshrn".u16 d28, q12, #2 \n\t" \ ++ no_rnd "vadd.u16 q1, q1, q13 \n\t" \ ++ vshrn".u16 d29, q1, #2 \n\t" \ ++ "vaddl.u8 q8, d0, d30 \n\t" \ ++ "vld1.64 {d2,d3,d4}, [%[p1]], %[l2] \n\t" \ ++ "vaddl.u8 q10, d1, d31 \n\t" \ ++ "vst1.64 {d28,d29}, [%[b],:128], %[line_size] \n\t" \ ++ "vadd.u16 q12, q8, q9 \n\t" \ ++ "pld [%[p1]] \n\t" \ ++ no_rnd "vadd.u16 q12, q12, q13 \n\t" \ ++ "vext.8 q2, q1, q2, #1 \n\t" \ ++ "vadd.u16 q0, q10, q11 \n\t" \ ++ vshrn".u16 d30, q12, #2 \n\t" \ ++ no_rnd "vadd.u16 q0, q0, q13 \n\t" \ ++ vshrn".u16 d31, q0, #2 \n\t" \ ++ "vaddl.u8 q9, d2, d4 \n\t" \ ++ "vst1.64 {d30,d31}, [%[b],:128], %[line_size] \n\t" \ ++ "vaddl.u8 q11, d3, d5 \n\t" \ ++ "bgt 1b \n\t" ++ ++#define PUT_PIXELS_8_X2(vhadd) \ ++ "1: \n\t" \ ++ "vld1.64 {d0,d1}, [%[p]], %[line_size] \n\t" \ ++ "vld1.64 {d2,d3}, [%[p]], %[line_size] \n\t" \ ++ "pld [%[p]] \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ "vext.8 d1, d0, d1, #1 \n\t" \ ++ "vext.8 d3, d2, d3, #1 \n\t" \ ++ "vswp d1, d2 \n\t" \ ++ vhadd".u8 q0, q0, q1 \n\t" \ ++ "vst1.64 {d0}, [%[b],:64], %[line_size] \n\t" \ ++ "vst1.64 {d1}, [%[b],:64], %[line_size] \n\t" \ ++ "bne 1b \n\t" ++ ++#define PUT_PIXELS_8_Y2(vhadd) \ ++ "add %[p1], %[p0], %[line_size] \n\t" \ ++ "lsl %[l2], %[line_size], #1 \n\t" \ ++ "vld1.64 {d0}, [%[p0]], %[l2] \n\t" \ ++ "vld1.64 {d1}, [%[p1]], %[l2] \n\t" \ ++ "1: \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ vhadd".u8 d4, d0, d1 \n\t" \ ++ "vst1.64 {d4}, [%[b],:64], %[line_size] \n\t" \ ++ "vld1.64 {d0}, [%[p0]], %[l2] \n\t" \ ++ vhadd".u8 d4, d0, d1 \n\t" \ ++ "vst1.64 {d4}, [%[b],:64], %[line_size] \n\t" \ ++ "vld1.64 {d1}, [%[p1]], %[l2] \n\t" \ ++ "bne 1b \n\t" ++ ++#define PUT_PIXELS8_XY2(vshrn, no_rnd) \ ++ "lsl %[l2], %[line_size], #1 \n\t" \ ++ "add %[p1], %[p0], %[line_size] \n\t" \ ++ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \ ++ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \ ++ "pld [%[p0]] \n\t" \ ++ "pld [%[p1]] \n\t" \ ++ "vext.8 d4, d0, d1, #1 \n\t" \ ++ "vext.8 d6, d2, d3, #1 \n\t" \ ++ "vaddl.u8 q8, d0, d4 \n\t" \ ++ "vaddl.u8 q9, d2, d6 \n\t" \ ++ "1: \n\t" \ ++ "subs %[h], %[h], #2 \n\t" \ ++ "vld1.64 {d0,d1}, [%[p0]], %[l2] \n\t" \ ++ "pld [%[p0]] \n\t" \ ++ "vadd.u16 q10, q8, q9 \n\t" \ ++ "vext.8 d4, d0, d1, #1 \n\t" \ ++ no_rnd "vadd.u16 q10, q10, q11 \n\t" \ ++ "vaddl.u8 q8, d0, d4 \n\t" \ ++ vshrn".u16 d5, q10, #2 \n\t" \ ++ "vld1.64 {d2,d3}, [%[p1]], %[l2] \n\t" \ ++ "vadd.u16 q10, q8, q9 \n\t" \ ++ "pld [%[p1]] \n\t" \ ++ no_rnd "vadd.u16 q10, q10, q11 \n\t" \ ++ "vst1.64 {d5}, [%[b],:64], %[line_size] \n\t" \ ++ vshrn".u16 d7, q10, #2 \n\t" \ ++ "vext.8 d6, d2, d3, #1 \n\t" \ ++ "vaddl.u8 q9, d2, d6 \n\t" \ ++ "vst1.64 {d7}, [%[b],:64], %[line_size] \n\t" \ ++ "bgt 1b \n\t" ++ ++static void put_pixels16_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ "1: \n\t" ++ "vld1.64 {d0,d1}, [%[pixels]], %[line_size] \n\t" ++ "vld1.64 {d2,d3}, [%[pixels]], %[line_size] \n\t" ++ "vld1.64 {d4,d5}, [%[pixels]], %[line_size] \n\t" ++ "vld1.64 {d6,d7}, [%[pixels]], %[line_size] \n\t" ++ "pld [%[pixels]] \n\t" ++ "subs %[h], %[h], #4 \n\t" ++ "vst1.64 {d0,d1}, [%[block],:128], %[line_size] \n\t" ++ "vst1.64 {d2,d3}, [%[block],:128], %[line_size] \n\t" ++ "vst1.64 {d4,d5}, [%[block],:128], %[line_size] \n\t" ++ "vst1.64 {d6,d7}, [%[block],:128], %[line_size] \n\t" ++ "bne 1b \n\t" ++ : [block]"+r"(block), [pixels]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "memory"); ++} ++ ++static void put_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ PUT_PIXELS_16_X2("vrhadd") ++ : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "memory"); ++} ++ ++static void put_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS_16_Y2("vrhadd") ++ : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "memory"); ++} ++ ++static void put_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS_16_XY2("vrshrn", "@") ++ : [b]"+r"(block), ++ [p0]"+r"(pixels), ++ [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", ++ "d28", "d29", "d30", "d31", ++ "q8", "q9", "q10", "q11", "q12", "memory"); ++} ++ ++static void put_pixels8_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ "1: \n\t" ++ "vld1.64 {d0}, [%[p]], %[line_size] \n\t" ++ "vld1.64 {d1}, [%[p]], %[line_size] \n\t" ++ "vld1.64 {d2}, [%[p]], %[line_size] \n\t" ++ "vld1.64 {d3}, [%[p]], %[line_size] \n\t" ++ "subs %[h], %[h], #4 \n\t" ++ "vst1.64 {d0}, [%[b],:64], %[line_size] \n\t" ++ "vst1.64 {d1}, [%[b],:64], %[line_size] \n\t" ++ "vst1.64 {d2}, [%[b],:64], %[line_size] \n\t" ++ "vst1.64 {d3}, [%[b],:64], %[line_size] \n\t" ++ "bne 1b \n\t" ++ : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "memory"); ++} ++ ++static void put_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ PUT_PIXELS_8_X2("vrhadd") ++ : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "memory"); ++} ++ ++static void put_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS_8_Y2("vrhadd") ++ : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d4", "memory"); ++} ++ ++static void put_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS8_XY2("vrshrn", "@") ++ : [b]"+r"(block), ++ [p0]"+r"(pixels), ++ [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d6", "d7", ++ "q8", "q9", "q10", "memory"); ++} ++ ++static void put_no_rnd_pixels16_x2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ PUT_PIXELS_16_X2("vhadd") ++ : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "memory"); ++} ++ ++static void put_no_rnd_pixels16_y2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS_16_Y2("vhadd") ++ : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "memory"); ++} ++ ++static void put_no_rnd_pixels16_xy2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ "vmov.i16 q13, #1 \n\t" ++ PUT_PIXELS_16_XY2("vshrn", "") ++ : [b]"+r"(block), ++ [p0]"+r"(pixels), ++ [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", ++ "d28", "d29", "d30", "d31", ++ "q8", "q9", "q10", "q11", "q12", "q13", "memory"); ++} ++ ++static void put_no_rnd_pixels8_x2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ asm volatile( ++ PUT_PIXELS_8_X2("vhadd") ++ : [b]"+r"(block), [p]"+r"(pixels), [h]"+r"(h) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "memory"); ++} ++ ++static void put_no_rnd_pixels8_y2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ PUT_PIXELS_8_Y2("vhadd") ++ : [b]"+r"(block), [p0]"+r"(pixels), [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d4", "memory"); ++} ++ ++static void put_no_rnd_pixels8_xy2_neon(uint8_t *block, const uint8_t *pixels, ++ int line_size, int h) ++{ ++ const uint8_t *p1; ++ int l2; ++ ++ asm volatile( ++ "vmov.i16 q11, #1 \n\t" ++ PUT_PIXELS8_XY2("vshrn", "") ++ : [b]"+r"(block), ++ [p0]"+r"(pixels), ++ [p1]"=&r"(p1), [h]"+r"(h), ++ [l2]"=&r"(l2) ++ : [line_size]"r"(line_size) ++ : "d0", "d1", "d2", "d3", "d4", "d6", "d7", ++ "q8", "q9", "q10", "q11", "memory"); ++} ++ ++static void put_h264_qpel16_mc00_neon(uint8_t *dst, uint8_t *src, int stride) ++{ ++ put_pixels16_neon(dst, src, stride, 16); ++} ++ ++void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) ++{ ++ c->put_pixels_tab[0][0] = put_pixels16_neon; ++ c->put_pixels_tab[0][1] = put_pixels16_x2_neon; ++ c->put_pixels_tab[0][2] = put_pixels16_y2_neon; ++ c->put_pixels_tab[0][3] = put_pixels16_xy2_neon; ++ c->put_pixels_tab[1][0] = put_pixels8_neon; ++ c->put_pixels_tab[1][1] = put_pixels8_x2_neon; ++ c->put_pixels_tab[1][2] = put_pixels8_y2_neon; ++ c->put_pixels_tab[1][3] = put_pixels8_xy2_neon; ++ ++ c->put_no_rnd_pixels_tab[0][0] = put_pixels16_neon; ++ c->put_no_rnd_pixels_tab[0][1] = put_no_rnd_pixels16_x2_neon; ++ c->put_no_rnd_pixels_tab[0][2] = put_no_rnd_pixels16_y2_neon; ++ c->put_no_rnd_pixels_tab[0][3] = put_no_rnd_pixels16_xy2_neon; ++ c->put_no_rnd_pixels_tab[1][0] = put_pixels8_neon; ++ c->put_no_rnd_pixels_tab[1][1] = put_no_rnd_pixels8_x2_neon; ++ c->put_no_rnd_pixels_tab[1][2] = put_no_rnd_pixels8_y2_neon; ++ c->put_no_rnd_pixels_tab[1][3] = put_no_rnd_pixels8_xy2_neon; ++ ++ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon; ++ ++ c->put_h264_qpel_pixels_tab[0][0] = put_h264_qpel16_mc00_neon; ++} +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/float_arm_vfp.c mythtv/libs/libavcodec/armv4l/float_arm_vfp.c +--- mythtv.orig/libs/libavcodec/armv4l/float_arm_vfp.c 1970-01-01 01:00:00.000000000 +0100 ++++ mythtv/libs/libavcodec/armv4l/float_arm_vfp.c 2008-07-24 19:54:01.023198000 +0200 +@@ -0,0 +1,208 @@ ++/* ++ * Copyright (c) 2008 Siarhei Siamashka <ssvb@users.sourceforge.net> ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include "libavcodec/dsputil.h" ++ ++/* ++ * VFP is a floating point coprocessor used in some ARM cores. VFP11 has 1 cycle ++ * throughput for almost all the instructions (except for double precision ++ * arithmetics), but rather high latency. Latency is 4 cycles for loads and 8 cycles ++ * for arithmetic operations. Scheduling code to avoid pipeline stalls is very ++ * important for performance. One more interesting feature is that VFP has ++ * independent load/store and arithmetics pipelines, so it is possible to make ++ * them work simultaneously and get more than 1 operation per cycle. Load/store ++ * pipeline can process 2 single precision floating point values per cycle and ++ * supports bulk loads and stores for large sets of registers. Arithmetic operations ++ * can be done on vectors, which allows to keep the arithmetics pipeline busy, ++ * while the processor may issue and execute other instructions. Detailed ++ * optimization manuals can be found at http://www.arm.com ++ */ ++ ++/** ++ * ARM VFP optimized implementation of 'vector_fmul_c' function. ++ * Assume that len is a positive number and is multiple of 8 ++ */ ++static void vector_fmul_vfp(float *dst, const float *src, int len) ++{ ++ int tmp; ++ asm volatile( ++ "fmrx %[tmp], fpscr\n\t" ++ "orr %[tmp], %[tmp], #(3 << 16)\n\t" /* set vector size to 4 */ ++ "fmxr fpscr, %[tmp]\n\t" ++ ++ "fldmias %[dst_r]!, {s0-s3}\n\t" ++ "fldmias %[src]!, {s8-s11}\n\t" ++ "fldmias %[dst_r]!, {s4-s7}\n\t" ++ "fldmias %[src]!, {s12-s15}\n\t" ++ "fmuls s8, s0, s8\n\t" ++ "1:\n\t" ++ "subs %[len], %[len], #16\n\t" ++ "fmuls s12, s4, s12\n\t" ++ "fldmiasge %[dst_r]!, {s16-s19}\n\t" ++ "fldmiasge %[src]!, {s24-s27}\n\t" ++ "fldmiasge %[dst_r]!, {s20-s23}\n\t" ++ "fldmiasge %[src]!, {s28-s31}\n\t" ++ "fmulsge s24, s16, s24\n\t" ++ "fstmias %[dst_w]!, {s8-s11}\n\t" ++ "fstmias %[dst_w]!, {s12-s15}\n\t" ++ "fmulsge s28, s20, s28\n\t" ++ "fldmiasgt %[dst_r]!, {s0-s3}\n\t" ++ "fldmiasgt %[src]!, {s8-s11}\n\t" ++ "fldmiasgt %[dst_r]!, {s4-s7}\n\t" ++ "fldmiasgt %[src]!, {s12-s15}\n\t" ++ "fmulsge s8, s0, s8\n\t" ++ "fstmiasge %[dst_w]!, {s24-s27}\n\t" ++ "fstmiasge %[dst_w]!, {s28-s31}\n\t" ++ "bgt 1b\n\t" ++ ++ "bic %[tmp], %[tmp], #(7 << 16)\n\t" /* set vector size back to 1 */ ++ "fmxr fpscr, %[tmp]\n\t" ++ : [dst_w] "+&r" (dst), [dst_r] "+&r" (dst), [src] "+&r" (src), [len] "+&r" (len), [tmp] "=&r" (tmp) ++ : ++ : "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", ++ "s8", "s9", "s10", "s11", "s12", "s13", "s14", "s15", ++ "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23", ++ "s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31", ++ "cc", "memory"); ++} ++ ++/** ++ * ARM VFP optimized implementation of 'vector_fmul_reverse_c' function. ++ * Assume that len is a positive number and is multiple of 8 ++ */ ++static void vector_fmul_reverse_vfp(float *dst, const float *src0, const float *src1, int len) ++{ ++ src1 += len; ++ asm volatile( ++ "fldmdbs %[src1]!, {s0-s3}\n\t" ++ "fldmias %[src0]!, {s8-s11}\n\t" ++ "fldmdbs %[src1]!, {s4-s7}\n\t" ++ "fldmias %[src0]!, {s12-s15}\n\t" ++ "fmuls s8, s3, s8\n\t" ++ "fmuls s9, s2, s9\n\t" ++ "fmuls s10, s1, s10\n\t" ++ "fmuls s11, s0, s11\n\t" ++ "1:\n\t" ++ "subs %[len], %[len], #16\n\t" ++ "fldmdbsge %[src1]!, {s16-s19}\n\t" ++ "fmuls s12, s7, s12\n\t" ++ "fldmiasge %[src0]!, {s24-s27}\n\t" ++ "fmuls s13, s6, s13\n\t" ++ "fldmdbsge %[src1]!, {s20-s23}\n\t" ++ "fmuls s14, s5, s14\n\t" ++ "fldmiasge %[src0]!, {s28-s31}\n\t" ++ "fmuls s15, s4, s15\n\t" ++ "fmulsge s24, s19, s24\n\t" ++ "fldmdbsgt %[src1]!, {s0-s3}\n\t" ++ "fmulsge s25, s18, s25\n\t" ++ "fstmias %[dst]!, {s8-s13}\n\t" ++ "fmulsge s26, s17, s26\n\t" ++ "fldmiasgt %[src0]!, {s8-s11}\n\t" ++ "fmulsge s27, s16, s27\n\t" ++ "fmulsge s28, s23, s28\n\t" ++ "fldmdbsgt %[src1]!, {s4-s7}\n\t" ++ "fmulsge s29, s22, s29\n\t" ++ "fstmias %[dst]!, {s14-s15}\n\t" ++ "fmulsge s30, s21, s30\n\t" ++ "fmulsge s31, s20, s31\n\t" ++ "fmulsge s8, s3, s8\n\t" ++ "fldmiasgt %[src0]!, {s12-s15}\n\t" ++ "fmulsge s9, s2, s9\n\t" ++ "fmulsge s10, s1, s10\n\t" ++ "fstmiasge %[dst]!, {s24-s27}\n\t" ++ "fmulsge s11, s0, s11\n\t" ++ "fstmiasge %[dst]!, {s28-s31}\n\t" ++ "bgt 1b\n\t" ++ ++ : [dst] "+&r" (dst), [src0] "+&r" (src0), [src1] "+&r" (src1), [len] "+&r" (len) ++ : ++ : "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", ++ "s8", "s9", "s10", "s11", "s12", "s13", "s14", "s15", ++ "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23", ++ "s24", "s25", "s26", "s27", "s28", "s29", "s30", "s31", ++ "cc", "memory"); ++} ++ ++#ifdef HAVE_ARMV6 ++/** ++ * ARM VFP optimized float to int16 conversion. ++ * Assume that len is a positive number and is multiple of 8, destination ++ * buffer is at least 4 bytes aligned (8 bytes alignment is better for ++ * performance), little endian byte sex ++ */ ++void float_to_int16_vfp(int16_t *dst, const float *src, int len) ++{ ++ asm volatile( ++ "fldmias %[src]!, {s16-s23}\n\t" ++ "ftosis s0, s16\n\t" ++ "ftosis s1, s17\n\t" ++ "ftosis s2, s18\n\t" ++ "ftosis s3, s19\n\t" ++ "ftosis s4, s20\n\t" ++ "ftosis s5, s21\n\t" ++ "ftosis s6, s22\n\t" ++ "ftosis s7, s23\n\t" ++ "1:\n\t" ++ "subs %[len], %[len], #8\n\t" ++ "fmrrs r3, r4, {s0, s1}\n\t" ++ "fmrrs r5, r6, {s2, s3}\n\t" ++ "fmrrs r7, r8, {s4, s5}\n\t" ++ "fmrrs ip, lr, {s6, s7}\n\t" ++ "fldmiasgt %[src]!, {s16-s23}\n\t" ++ "ssat r4, #16, r4\n\t" ++ "ssat r3, #16, r3\n\t" ++ "ssat r6, #16, r6\n\t" ++ "ssat r5, #16, r5\n\t" ++ "pkhbt r3, r3, r4, lsl #16\n\t" ++ "pkhbt r4, r5, r6, lsl #16\n\t" ++ "ftosisgt s0, s16\n\t" ++ "ftosisgt s1, s17\n\t" ++ "ftosisgt s2, s18\n\t" ++ "ftosisgt s3, s19\n\t" ++ "ftosisgt s4, s20\n\t" ++ "ftosisgt s5, s21\n\t" ++ "ftosisgt s6, s22\n\t" ++ "ftosisgt s7, s23\n\t" ++ "ssat r8, #16, r8\n\t" ++ "ssat r7, #16, r7\n\t" ++ "ssat lr, #16, lr\n\t" ++ "ssat ip, #16, ip\n\t" ++ "pkhbt r5, r7, r8, lsl #16\n\t" ++ "pkhbt r6, ip, lr, lsl #16\n\t" ++ "stmia %[dst]!, {r3-r6}\n\t" ++ "bgt 1b\n\t" ++ ++ : [dst] "+&r" (dst), [src] "+&r" (src), [len] "+&r" (len) ++ : ++ : "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", ++ "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23", ++ "r3", "r4", "r5", "r6", "r7", "r8", "ip", "lr", ++ "cc", "memory"); ++} ++#endif ++ ++void ff_float_init_arm_vfp(DSPContext* c, AVCodecContext *avctx) ++{ ++ c->vector_fmul = vector_fmul_vfp; ++ c->vector_fmul_reverse = vector_fmul_reverse_vfp; ++#ifdef HAVE_ARMV6 ++ c->float_to_int16 = float_to_int16_vfp; ++#endif ++} +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/h264dsp_neon.S mythtv/libs/libavcodec/armv4l/h264dsp_neon.S +--- mythtv.orig/libs/libavcodec/armv4l/h264dsp_neon.S 1970-01-01 01:00:00.000000000 +0100 ++++ mythtv/libs/libavcodec/armv4l/h264dsp_neon.S 2008-07-24 19:54:01.033198000 +0200 +@@ -0,0 +1,148 @@ ++/* ++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com> ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++ .fpu neon ++ ++ .text ++ .align ++ .global ff_put_h264_chroma_mc8_neon ++ .func ff_put_h264_chroma_mc8_neon ++/* void ff_put_h264_chroma_mc8_neon(uint8_t *dst, uint8_t *src, int stride, ++ int h, int x, int y) */ ++ff_put_h264_chroma_mc8_neon: ++ push {r4-r7} ++ ldrd r4, [sp, #16] ++ ++ pld [r1] ++ pld [r1, r2] ++ ++ muls r7, r4, r5 ++ rsb r6, r7, r5, lsl #3 ++ rsb ip, r7, r4, lsl #3 ++ sub r4, r7, r4, lsl #3 ++ sub r4, r4, r5, lsl #3 ++ add r4, r4, #64 ++ ++ beq 2f ++ ++ add r5, r1, r2 ++ ++ vdup.8 d0, r4 ++ lsl r4, r2, #1 ++ vdup.8 d1, ip ++ vld1.64 {d4,d5}, [r1], r4 ++ vdup.8 d2, r6 ++ vld1.64 {d6,d7}, [r5], r4 ++ vdup.8 d3, r7 ++ ++ mov r6, #32 ++ vext.8 d5, d4, d5, #1 ++ vdup.16 q12, r6 ++ vext.8 d7, d6, d7, #1 ++1: ++ pld [r5] ++ vmull.u8 q8, d4, d0 ++ vmlal.u8 q8, d5, d1 ++ vld1.64 {d4,d5}, [r1], r4 ++ vmlal.u8 q8, d6, d2 ++ vext.8 d5, d4, d5, #1 ++ vmlal.u8 q8, d7, d3 ++ vmull.u8 q9, d6, d0 ++ vadd.i16 q8, q8, q12 ++ subs r3, r3, #2 ++ vmlal.u8 q9, d7, d1 ++ vshrn.u16 d16, q8, #6 ++ vld1.64 {d6,d7}, [r5], r4 ++ vmlal.u8 q9, d4, d2 ++ vmlal.u8 q9, d5, d3 ++ pld [r1] ++ vadd.i16 q9, q9, q12 ++ vst1.64 {d16}, [r0,:64], r2 ++ vshrn.u16 d17, q9, #6 ++ vext.8 d7, d6, d7, #1 ++ vst1.64 {d17}, [r0,:64], r2 ++ bgt 1b ++ ++ pop {r4-r7} ++ bx lr ++ ++2: ++ tst r6, r6 ++ add ip, ip, r6 ++ vdup.8 d0, r4 ++ vdup.8 d1, ip ++ mov r6, #32 ++ vdup.16 q12, r6 ++ ++ beq 4f ++ ++ add r5, r1, r2 ++ lsl r4, r2, #1 ++ vld1.64 {d4}, [r1], r4 ++ vld1.64 {d6}, [r5], r4 ++3: ++ pld [r5] ++ vmull.u8 q8, d4, d0 ++ vmlal.u8 q8, d6, d1 ++ vld1.64 {d4}, [r1], r4 ++ vmull.u8 q9, d6, d0 ++ vadd.i16 q8, q8, q12 ++ vmlal.u8 q9, d4, d1 ++ vshrn.u16 d16, q8, #6 ++ vadd.i16 q9, q9, q12 ++ vst1.64 {d16}, [r0,:64], r2 ++ vshrn.u16 d17, q9, #6 ++ subs r3, r3, #2 ++ vld1.64 {d6}, [r5], r4 ++ pld [r1] ++ vst1.64 {d17}, [r0,:64], r2 ++ bgt 3b ++ ++ pop {r4-r7} ++ bx lr ++ ++4: ++ vld1.64 {d4,d5}, [r1], r2 ++ vld1.64 {d6,d7}, [r1], r2 ++ vext.8 d5, d4, d5, #1 ++ vext.8 d7, d6, d7, #1 ++5: ++ pld [r1] ++ subs r3, r3, #2 ++ vmull.u8 q8, d4, d0 ++ vmlal.u8 q8, d5, d1 ++ vld1.64 {d4,d5}, [r1], r2 ++ vmull.u8 q9, d6, d0 ++ vmlal.u8 q9, d7, d1 ++ pld [r1] ++ vadd.i16 q8, q8, q12 ++ vadd.i16 q9, q9, q12 ++ vext.8 d5, d4, d5, #1 ++ vshrn.u16 d16, q8, #6 ++ vld1.64 {d6,d7}, [r1], r2 ++ vshrn.u16 d17, q9, #6 ++ vst1.64 {d16}, [r0,:64], r2 ++ vext.8 d7, d6, d7, #1 ++ vst1.64 {d17}, [r0,:64], r2 ++ bgt 5b ++ ++ pop {r4-r7} ++ bx lr ++ .endfunc +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_arm.c mythtv/libs/libavcodec/armv4l/mpegvideo_arm.c +--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_arm.c 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/mpegvideo_arm.c 2008-07-24 19:54:01.263198000 +0200 +@@ -18,9 +18,9 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "dsputil.h" +-#include "mpegvideo.h" +-#include "avcodec.h" ++#include "libavcodec/avcodec.h" ++#include "libavcodec/dsputil.h" ++#include "libavcodec/mpegvideo.h" + + extern void MPV_common_init_iwmmxt(MpegEncContext *s); + extern void MPV_common_init_armv5te(MpegEncContext *s); +@@ -28,7 +28,7 @@ + void MPV_common_init_armv4l(MpegEncContext *s) + { + /* IWMMXT support is a superset of armv5te, so +- * allow optimised functions for armv5te unless ++ * allow optimized functions for armv5te unless + * a better iwmmxt function exists + */ + #ifdef HAVE_ARMV5TE +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_armv5te.c mythtv/libs/libavcodec/armv4l/mpegvideo_armv5te.c +--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_armv5te.c 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/mpegvideo_armv5te.c 2008-07-24 19:54:01.263198000 +0200 +@@ -19,9 +19,9 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "dsputil.h" +-#include "mpegvideo.h" +-#include "avcodec.h" ++#include "libavcodec/avcodec.h" ++#include "libavcodec/dsputil.h" ++#include "libavcodec/mpegvideo.h" + + + #ifdef ENABLE_ARM_TESTS +@@ -65,7 +65,7 @@ + ({ DCTELEM *xblock = xxblock; \ + int xqmul = xxqmul, xqadd = xxqadd, xcount = xxcount, xtmp; \ + int xdata1, xdata2; \ +-__asm__ __volatile__( \ ++asm volatile( \ + "subs %[count], %[count], #2 \n\t" \ + "ble 2f \n\t" \ + "ldrd r4, [%[block], #0] \n\t" \ +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c mythtv/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c +--- mythtv.orig/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/mpegvideo_iwmmxt.c 2008-07-24 19:54:01.273198000 +0200 +@@ -18,9 +18,9 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include "dsputil.h" +-#include "mpegvideo.h" +-#include "avcodec.h" ++#include "libavcodec/avcodec.h" ++#include "libavcodec/dsputil.h" ++#include "libavcodec/mpegvideo.h" + + static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, + DCTELEM *block, int n, int qscale) +@@ -48,7 +48,7 @@ + else + nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; + +- __asm__ __volatile__ ( ++ asm volatile ( + /* "movd %1, %%mm6 \n\t" //qmul */ + /* "packssdw %%mm6, %%mm6 \n\t" */ + /* "packssdw %%mm6, %%mm6 \n\t" */ +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/simple_idct_arm.S mythtv/libs/libavcodec/armv4l/simple_idct_arm.S +--- mythtv.orig/libs/libavcodec/armv4l/simple_idct_arm.S 2008-07-23 12:19:05.000000000 +0200 ++++ mythtv/libs/libavcodec/armv4l/simple_idct_arm.S 2008-07-24 19:54:01.503198000 +0200 +@@ -79,7 +79,7 @@ + + + __row_loop: +- @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimise ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) ++ @@ read the row and check if it is null, almost null, or not, according to strongarm specs, it is not necessary to optimize ldr accesses (i.e. split 32bits in 2 16bits words), at least it gives more usable registers :) + ldr r1, [r14, #0] @ R1=(int32)(R12)[0]=ROWr32[0] (relative row cast to a 32b pointer) + ldr r2, [r14, #4] @ R2=(int32)(R12)[1]=ROWr32[1] + ldr r3, [r14, #8] @ R3=ROWr32[2] +@@ -421,7 +421,7 @@ + @@ col[40] = ((a2 - b2) >> COL_SHIFT); + @@ col[48] = ((a1 - b1) >> COL_SHIFT); + @@ col[56] = ((a0 - b0) >> COL_SHIFT); +- @@@@@ no optimisation here @@@@@ ++ @@@@@ no optimization here @@@@@ + add r8, r6, r0 @ R8=a0+b0 + add r9, r2, r1 @ R9=a1+b1 + mov r8, r8, asr #COL_SHIFT +diff -Nurd mythtv.orig/libs/libavcodec/armv4l/simple_idct_neon.S mythtv/libs/libavcodec/armv4l/simple_idct_neon.S +--- mythtv.orig/libs/libavcodec/armv4l/simple_idct_neon.S 1970-01-01 01:00:00.000000000 +0100 ++++ mythtv/libs/libavcodec/armv4l/simple_idct_neon.S 2008-07-24 19:54:01.503198000 +0200 +@@ -0,0 +1,388 @@ ++/* ++ * ARM NEON IDCT ++ * ++ * Copyright (c) 2008 Mans Rullgard <mans@mansr.com> ++ * ++ * Based on Simple IDCT ++ * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at> ++ * ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * FFmpeg 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with FFmpeg; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#define W1 22725 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W2 21407 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W3 19266 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W4 16383 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W5 12873 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W6 8867 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W7 4520 //cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 ++#define W4c ((1<<(COL_SHIFT-1))/W4) ++#define ROW_SHIFT 11 ++#define COL_SHIFT 20 ++ ++#define w1 d0[0] ++#define w2 d0[1] ++#define w3 d0[2] ++#define w4 d0[3] ++#define w5 d1[0] ++#define w6 d1[1] ++#define w7 d1[2] ++#define w4c d1[3] ++ ++ .fpu neon ++ ++ .macro idct_col4_top ++ vmull.s16 q7, d6, w2 /* q9 = W2 * col[2] */ ++ vmull.s16 q8, d6, w6 /* q10 = W6 * col[2] */ ++ vmull.s16 q9, d4, w1 /* q9 = W1 * col[1] */ ++ vadd.i32 q11, q15, q7 ++ vmull.s16 q10, d4, w3 /* q10 = W3 * col[1] */ ++ vadd.i32 q12, q15, q8 ++ vmull.s16 q5, d4, w5 /* q5 = W5 * col[1] */ ++ vsub.i32 q13, q15, q8 ++ vmull.s16 q6, d4, w7 /* q6 = W7 * col[1] */ ++ vsub.i32 q14, q15, q7 ++ ++ vmlal.s16 q9, d8, w3 /* q9 += W3 * col[3] */ ++ vmlsl.s16 q10, d8, w7 /* q10 -= W7 * col[3] */ ++ vmlsl.s16 q5, d8, w1 /* q5 -= W1 * col[3] */ ++ vmlsl.s16 q6, d8, w5 /* q6 -= W5 * col[3] */ ++ .endm ++ ++ .macro idct_col4_mid1 ++ vmull.s16 q7, d3, w4 /* q7 = W4 * col[4] */ ++ vadd.i32 q11, q11, q7 ++ vsub.i32 q12, q12, q7 ++ vsub.i32 q13, q13, q7 ++ vadd.i32 q14, q14, q7 ++ .endm ++ ++ .macro idct_col4_mid2 ++ vmlal.s16 q9, d5, w5 /* q9 += W5 * col[5] */ ++ vmlsl.s16 q10, d5, w1 /* q10 -= W1 * col[5] */ ++ vmlal.s16 q5, d5, w7 /* q5 += W7 * col[5] */ ++ vmlal.s16 q6, d5, w3 /* q6 += W3 * col[5] */ ++ .endm ++ ++ .macro idct_col4_mid3 ++ vmull.s16 q7, d7, w6 /* q7 = W6 * col[6] */ ++ vmull.s16 q8, d7, w2 /* q8 = W2 * col[6] */ ++ vadd.i32 q11, q11, q7 ++ vsub.i32 q12, q12, q8 ++ vadd.i32 q13, q13, q8 ++ vsub.i32 q14, q14, q7 ++ .endm ++ ++ .macro idct_col4_mid4 ++ vmlal.s16 q9, d9, w7 ++ vmlsl.s16 q10, d9, w5 ++ vmlal.s16 q5, d9, w3 ++ vmlsl.s16 q6, d9, w1 ++ .endm ++ ++ .macro idct_col4_mid ++ vmull.s16 q7, d3, w4 /* q7 = W4 * col[4] */ ++ vmlal.s16 q9, d5, w5 /* q9 += W5 * col[5] */ ++ vmlsl.s16 q10, d5, w1 /* q10 -= W1 * col[5] */ ++ vadd.i32 q11, q11, q7 ++ vmull.s16 q8, d7, w2 /* q8 = W2 * col[6] */ ++ vsub.i32 q12, q12, q7 ++ vmlal.s16 q5, d5, w7 /* q5 += W7 * col[5] */ ++ vsub.i32 q13, q13, q7 ++ vmlal.s16 q6, d5, w3 /* q6 += W3 * col[5] */ ++ vadd.i32 q14, q14, q7 ++ vmull.s16 q7, d7, w6 /* q7 = W6 * col[6] */ ++ vadd.i32 q11, q11, q7 ++ vmlal.s16 q9, d9, w7 ++ vsub.i32 q12, q12, q8 ++ vmlsl.s16 q10, d9, w5 ++ vadd.i32 q13, q13, q8 ++ vmlal.s16 q5, d9, w3 ++ vsub.i32 q14, q14, q7 ++ vmlsl.s16 q6, d9, w1 ++ .endm ++ ++ .macro idct_col4_end ++ vadd.i32 q3, q11, q9 ++ vadd.i32 q4, q12, q10 ++ vadd.i32 q7, q13, q5 ++ vadd.i32 q8, q14, q6 ++ vsub.i32 q11, q11, q9 ++ vsub.i32 q12, q12, q10 ++ vsub.i32 q13, q13, q5 ++ vsub.i32 q14, q14, q6 ++ .endm ++ ++ .text ++ .align ++ .type idct_row4_neon, %function ++ .func idct_row4_neon ++idct_row4_neon: ++ vld1.64 {d2,d3}, [a3,:128]! ++ vld1.64 {d4,d5}, [a3,:128]! ++ vld1.64 {d6,d7}, [a3,:128]! ++ vld1.64 {d8,d9}, [a3,:128]! ++ add a3, a3, #-64 ++ ++ vmov.i32 q15, #(1<<(ROW_SHIFT-1)) ++ vorr d10, d3, d5 ++ vtrn.16 q1, q2 ++ vorr d11, d7, d9 ++ vtrn.16 q3, q4 ++ vorr d10, d10, d11 ++ vtrn.32 q1, q3 ++ vmlal.s16 q15, d2, w4 /* q15 += W4 * col[0] */ ++ vtrn.32 q2, q4 ++ vmov a4, v1, d10 ++ ++ idct_col4_top ++ ++ orrs a4, a4, v1 ++ beq 1f ++ idct_col4_mid ++1: ++ vadd.i32 q3, q11, q9 ++ vadd.i32 q4, q12, q10 ++ vshrn.i32 d2, q3, #ROW_SHIFT ++ vadd.i32 q7, q13, q5 ++ vshrn.i32 d4, q4, #ROW_SHIFT ++ vadd.i32 q8, q14, q6 ++ vshrn.i32 d6, q7, #ROW_SHIFT ++ vsub.i32 q11, q11, q9 ++ vshrn.i32 d8, q8, #ROW_SHIFT ++ vsub.i32 q12, q12, q10 ++ vshrn.i32 d9, q11, #ROW_SHIFT ++ vsub.i32 q13, q13, q5 ++ vshrn.i32 d7, q12, #ROW_SHIFT ++ vsub.i32 q14, q14, q6 ++ vshrn.i32 d5, q13, #ROW_SHIFT ++ vshrn.i32 d3, q14, #ROW_SHIFT ++ ++ vtrn.16 q1, q2 ++ vtrn.16 q3, q4 ++ vtrn.32 q1, q3 ++ vtrn.32 q2, q4 ++ ++ vst1.64 {d2,d3}, [a3,:128]! ++ vst1.64 {d4,d5}, [a3,:128]! ++ vst1.64 {d6,d7}, [a3,:128]! ++ vst1.64 {d8,d9}, [a3,:128]! ++ ++ mov pc, lr ++ .endfunc ++ ++ .align ++ .type idct_col4_neon, %function ++ .func idct_col4_neon ++idct_col4_neon: ++ mov ip, #16 ++ vld1.64 {d2}, [a3,:64], ip /* d2 = col[0] */ ++ vld1.64 {d4}, [a3,:64], ip /* d3 = col[1] */ ++ vld1.64 {d6}, [a3,:64], ip /* d4 = col[2] */ ++ vld1.64 {d8}, [a3,:64], ip /* d5 = col[3] */ ++ vld1.64 {d3}, [a3,:64], ip /* d6 = col[4] */ ++ vld1.64 {d5}, [a3,:64], ip /* d7 = col[5] */ ++ vld1.64 {d7}, [a3,:64], ip /* d8 = col[6] */ ++ vld1.64 {d9}, [a3,:64], ip /* d9 = col[7] */ ++ ++ vrev64.32 d11, d3 ++ vrev64.32 d13, d5 ++ vorr d11, d3, d11 ++ vrev64.32 d15, d7 ++ vorr d13, d5, d13 ++ vrev64.32 d17, d9 ++ vorr d15, d7, d15 ++ vmov.32 v1, d11[0] ++ vmov.32 v2, d13[0] ++ vorr d17, d9, d17 ++ vmov.32 v3, d15[0] ++ vmov.32 ip, d17[0] ++ vdup.16 d30, w4c ++ vadd.i16 d30, d30, d2 ++ vmull.s16 q15, d30, w4 /* q15 = W4 * (col[0]+(1<<(COL_SHIFT-1))/W4) */ ++ ++ idct_col4_top ++ tst v1, v1 ++ beq 1f ++ idct_col4_mid1 ++1: tst v2, v2 ++ beq 2f ++ idct_col4_mid2 ++2: tst v3, v3 ++ beq 3f ++ idct_col4_mid3 ++3: tst ip, ip ++ beq 4f ++ idct_col4_mid4 ++4: ++ idct_col4_end ++ ++ vshr.s32 q2, q3, #COL_SHIFT ++ vshr.s32 q3, q4, #COL_SHIFT ++ vmovn.i32 d2, q2 ++ vshr.s32 q4, q7, #COL_SHIFT ++ vmovn.i32 d3, q3 ++ vshr.s32 q5, q8, #COL_SHIFT ++ vmovn.i32 d4, q4 ++ vshr.s32 q6, q14, #COL_SHIFT ++ vmovn.i32 d5, q5 ++ vshr.s32 q7, q13, #COL_SHIFT ++ vmovn.i32 d6, q6 ++ vshr.s32 q8, q12, #COL_SHIFT ++ vmovn.i32 d7, q7 ++ vshr.s32 q9, q11, #COL_SHIFT ++ vmovn.i32 d8, q8 ++ vmovn.i32 d9, q9 ++ ++ mov pc, lr ++ .endfunc ++ ++ .macro idct_col4_st16 ++ mov ip, #16 ++ vst1.64 {d2}, [a3,:64], ip ++ vst1.64 {d3}, [a3,:64], ip ++ vst1.64 {d4}, [a3,:64], ip ++ vst1.64 {d5}, [a3,:64], ip ++ vst1.64 {d6}, [a3,:64], ip ++ vst1.64 {d7}, [a3,:64], ip ++ vst1.64 {d8}, [a3,:64], ip ++ vst1.64 {d9}, [a3,:64], ip ++ .endm ++ ++ .align ++ .type idct_col4_add8, %function ++ .func idct_col4_add8 ++idct_col4_add8: ++ vld1.32 {d10[0]}, [a1,:32], a2 ++ vld1.32 {d10[1]}, [a1,:32], a2 ++ vld1.32 {d11[0]}, [a1,:32], a2 ++ vld1.32 {d11[1]}, [a1,:32], a2 ++ vld1.32 {d12[0]}, [a1,:32], a2 ++ vld1.32 {d12[1]}, [a1,:32], a2 ++ vld1.32 {d13[0]}, [a1,:32], a2 ++ vld1.32 {d13[1]}, [a1,:32], a2 ++ ++ vaddw.u8 q1, q1, d10 ++ vaddw.u8 q2, q2, d11 ++ vaddw.u8 q3, q3, d12 ++ vaddw.u8 q4, q4, d13 ++ ++ sub a1, a1, a2, lsl #3 ++ .endfunc ++ ++ .type idct_col4_st8, %function ++ .func idct_col4_st8 ++idct_col4_st8: ++ vqmovun.s16 d2, q1 ++ vqmovun.s16 d3, q2 ++ vqmovun.s16 d4, q3 ++ vqmovun.s16 d5, q4 ++ ++ vst1.32 {d2[0]}, [a1,:32], a2 ++ vst1.32 {d2[1]}, [a1,:32], a2 ++ vst1.32 {d3[0]}, [a1,:32], a2 ++ vst1.32 {d3[1]}, [a1,:32], a2 ++ vst1.32 {d4[0]}, [a1,:32], a2 ++ vst1.32 {d4[1]}, [a1,:32], a2 ++ vst1.32 {d5[0]}, [a1,:32], a2 ++ vst1.32 {d5[1]}, [a1,:32], a2 ++ mov pc, lr ++ .endfunc ++ ++ .align 4 ++const: .short W1, W2, W3, W4, W5, W6, W7, W4c ++ ++ .macro idct_start data ++ pld [\data] ++ pld [\data, #64] ++ push {v1-v3, lr} ++ vpush {d8-d15} ++ adr a4, const ++ vld1.64 {d0,d1}, [a4,:128] ++ .endm ++ ++ .macro idct_end ++ vpop {d8-d15} ++ pop {v1-v3, pc} ++ .endm ++ ++ .align ++ .global ff_simple_idct_neon ++ .type ff_simple_idct_neon, %function ++ .func ff_simple_idct_neon ++/* void ff_simple_idct_neon(DCTELEM *data); */ ++ff_simple_idct_neon: ++ idct_start a1 ++ ++ mov a3, a1 ++ bl idct_row4_neon ++ bl idct_row4_neon ++ add a3, a3, #-128 ++ bl idct_col4_neon ++ add a3, a3, #-128 ++ idct_col4_st16 ++ add a3, a3, #-120 ++ bl idct_col4_neon ++ add a3, a3, #-128 ++ idct_col4_st16 ++ ++ idct_end ++ .endfunc ++ ++ .align ++ .global ff_simple_idct_put_neon ++ .type ff_simple_idct_put_neon, %function ++ .func ff_simple_idct_put_neon ++/* void ff_simple_idct_put_neon(uint8_t *dst, int line_size, DCTELEM *data); */ ++ff_simple_idct_put_neon: ++ idct_start a3 ++ ++ bl idct_row4_neon ++ bl idct_row4_neon ++ add a3, a3, #-128 ++ bl idct_col4_neon ++ bl idct_col4_st8 ++ sub a1, a1, a2, lsl #3 ++ add a1, a1, #4 ++ add a3, a3, #-120 ++ bl idct_col4_neon ++ bl idct_col4_st8 ++ ++ idct_end ++ .endfunc ++ ++ .align ++ .global ff_simple_idct_add_neon ++ .type ff_simple_idct_add_neon, %function ++ .func ff_simple_idct_add_neon ++/* void ff_simple_idct_add_neon(uint8_t *dst, int line_size, DCTELEM *data); */ ++ff_simple_idct_add_neon: ++ idct_start a3 ++ ++ bl idct_row4_neon ++ bl idct_row4_neon ++ add a3, a3, #-128 ++ bl idct_col4_neon ++ bl idct_col4_add8 ++ sub a1, a1, a2, lsl #3 ++ add a1, a1, #4 ++ add a3, a3, #-120 ++ bl idct_col4_neon ++ bl idct_col4_add8 ++ ++ idct_end ++ .endfunc +diff -Nurd mythtv.orig/libs/libavcodec/avcodec.h mythtv/libs/libavcodec/avcodec.h +--- mythtv.orig/libs/libavcodec/avcodec.h 2008-07-23 12:19:11.000000000 +0200 ++++ mythtv/libs/libavcodec/avcodec.h 2008-07-24 19:56:46.953198000 +0200 +@@ -1328,6 +1328,8 @@ + #define FF_IDCT_SIMPLEARMV6 17 + #define FF_IDCT_SIMPLEVIS 18 + #define FF_IDCT_WMV2 19 ++#define FF_IDCT_FAAN 20 ++#define FF_IDCT_SIMPLENEON 21 + + /** + * slice count +diff -Nurd mythtv.orig/libs/libavcodec/libavcodec.pro mythtv/libs/libavcodec/libavcodec.pro +--- mythtv.orig/libs/libavcodec/libavcodec.pro 2008-07-23 12:19:10.000000000 +0200 ++++ mythtv/libs/libavcodec/libavcodec.pro 2008-07-24 19:54:01.503198000 +0200 +@@ -413,6 +413,8 @@ + + contains( HAVE_ARMV6, yes ) { SOURCES += armv4l/simple_idct_armv6.S } + ++contains( HAVE_NEON, yes ) { SOURCES += armv4l/float_arm_vfp.c armv4l/simple_idct_neon.S armv4l/dsputil_neon.c armv4l/h264dsp_neon.S } ++ + contains( HAVE_VIS, yes ) { + SOURCES += sparc/dsputil_vis.c + SOURCES += sparc/simple_idct_vis.c +diff -Nurd mythtv.orig/libs/libavcodec/utils.c mythtv/libs/libavcodec/utils.c +--- mythtv.orig/libs/libavcodec/utils.c 2008-07-23 12:19:10.000000000 +0200 ++++ mythtv/libs/libavcodec/utils.c 2008-07-24 19:58:12.403198000 +0200 +@@ -594,6 +594,7 @@ + {"sh4", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SH4, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"simplearm", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARM, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"simplearmv5te", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLEARMV5TE, INT_MIN, INT_MAX, V|E|D, "idct"}, ++{"simpleneon", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_SIMPLENEON, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"h264", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_H264, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"vp3", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_VP3, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"ipp", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_IPP, INT_MIN, INT_MAX, V|E|D, "idct"}, diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc index 9b7a0a768e..8355e0f1a1 100644 --- a/packages/mythtv/mythtv.inc +++ b/packages/mythtv/mythtv.inc @@ -7,8 +7,6 @@ DEPENDS = "jack alsa-lib lame libxinerama libxv libxxf86vm libxvmc lirc" SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2" -inherit qmake2 qt4x11 - QMAKE_PROFILES = "mythtv.pro" diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb index 1602ce0e42..fd2c351845 100644 --- a/packages/mythtv/mythtv_0.18.1.bb +++ b/packages/mythtv/mythtv_0.18.1.bb @@ -1,5 +1,7 @@ require mythtv.inc +inherit qmake2 qt3x11 + PR = "r1" SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \ diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb index c9e2fdc431..2ebebd3012 100644 --- a/packages/mythtv/mythtv_0.20.bb +++ b/packages/mythtv/mythtv_0.20.bb @@ -1,5 +1,7 @@ require mythtv.inc +inherit qmake2 qt3x11 + DEPENDS += "openchrome" PR = "r0" diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb index a33c446813..eb9d98c674 100644 --- a/packages/mythtv/mythtv_0.21.bb +++ b/packages/mythtv/mythtv_0.21.bb @@ -1,23 +1,33 @@ require mythtv.inc -PR = "r0" +inherit qmake qt3x11 -#SRC_URI += "file://configure.patch;patch=1 \ -# file://libmyth-libdir.patch;patch=1" +PR = "${SRCREV}+r2" +REALPV = "0.21" -# Seen on the mythtv web page: -# http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1 +SRCREV = "17789" +SRC_URI = "svn://svn.mythtv.org/svn/branches/release-0-21-fixes;module=mythtv;proto=http" + +SRC_URI += " \ + file://ffmpeg-arm-update.diff;patch=1 \ + file://configure.patch;patch=1 \ + file://configh \ + file://configmak \ + " + +S = "${WORKDIR}/mythtv" QMAKE_PROFILES = "mythtv.pro" mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia" PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" -FILES_mythtv-bin = "${bindir}" -FILES_mythtv-filters = "${libdir}/mythtv/filters" +FILES_mythtv-bin = "${bindir}/*" +FILES_mythtv-filters = "${libdir}/mythtv/filters/*" FILES_mythtv-data = "${datadir}" RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" ALLOW_EMPTY_${PN} = "1" @@ -28,7 +38,7 @@ python __anonymous () { import bb mythlibs = bb.data.getVar('mythlibs', d).split() - pv = bb.data.expand(bb.data.getVar("PV", d), d) + pv = bb.data.expand(bb.data.getVar("REALPV", d), d) for m in mythlibs: bb.data.setVar("FILES_lib%s%s" % (m, pv), "${libdir}/lib%s-%s.so.*" % (m, pv), d) @@ -38,22 +48,50 @@ python __anonymous () { bb.data.setVar("PACKAGES", packages, d) } + +EXTRA_OECONF_armv5te = " --enable-armv5te " +EXTRA_OECONF_armv6 = " --enable-armv6 " +EXTRA_OECONF_armv7a = " --enable-armv6" + +#build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up) +#not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '${MY_ARCH}',d)}" + +MY_TARGET_CC_ARCH := "${TARGET_CC_ARCH}" +TARGET_CC_ARCH = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', '-march=iwmmxt -mtune=iwmmxt', '${MY_TARGET_CC_ARCH}',d)}" + +EXTRA_OECONF_append = " ${@base_contains('MACHINE_FEATURES', 'iwmmxt', '--enable-pxa --enable-iwmmxt', '',d)} " + do_configure_prepend() { # it's not autotools anyway, so we call ./configure directly find . -name "Makefile"|xargs rm -f + ./configure --prefix=/usr \ --mandir=/usr/man \ --cpu=${MYTHTV_ARCH} \ + --arch=${MYTHTV_ARCH} \ --disable-altivec \ + --disable-opengl-video \ + --disable-strip \ --enable-v4l \ --enable-audio-oss \ --enable-proc-opt \ --enable-dvb \ + --enable-libmp3lame \ --cross-compile \ - --dvb-path=${STAGING_INCDIR} + --dvb-path=${STAGING_INCDIR} \ + --with-bindings= \ + ${EXTRA_OECONF} sed 's!PREFIX =.*!PREFIX = ${prefix}!;/INCLUDEPATH += $${PREFIX}\/include/d' < settings.pro > settings.pro.new mv settings.pro.new settings.pro + for pro in ${S}/*/*pro ${S}/*/*/*pro ${S}/*/*/*/*pro ; do + sed -i -e s:opengl::g $pro + done + sed -i /.SUBDIR/d ${S}/bindings/*pro + cat ${WORKDIR}/configh >> ${S}/config.h + cat ${WORKDIR}/configmak ${OPTSMAK} >> ${S}/config.mak } python populate_packages_prepend () { diff --git a/packages/mythtv/mythtv_svn.bb b/packages/mythtv/mythtv_svn.bb index cb22a36f58..83ce8252fa 100644 --- a/packages/mythtv/mythtv_svn.bb +++ b/packages/mythtv/mythtv_svn.bb @@ -1,9 +1,11 @@ require mythtv.inc +inherit qmake2 qt4x11 + DEFAULT_PREFERENCE = "-1" -PV = "0.21+svnr${SRCREV}" -PR = "r1" +PV = "0.21+0.22rc+svnr${SRCREV}" +PR = "r2" REALPV = "0.22" SRCREV = "17892" @@ -22,7 +24,6 @@ PACKAGES =+ "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-dat FILES_${PN}-dbg += "${libdir}/mythtv/filters/.debug" FILES_mythtv-backend = "${bindir}/mythbackend ${bindir}/mythcommflag ${bindir}/mythfilldatabase ${bindir}/mythtranscode" FILES_mythtv-frontend = "${bindir}/mythfrontend ${datadir}/mythtv/i18n/mythfrontend_* ${datadir}/mythtv/*.ttf" -RDEPENDS_mythtv-frontend = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats" FILES_mythtv-bin = "${bindir}/*" FILES_mythtv-filters = "${libdir}/mythtv/filters/*" FILES_mythtv-data = "${datadir}" @@ -48,7 +49,7 @@ python __anonymous () { EXTRA_OECONF_armv5te = " --enable-armv5te " EXTRA_OECONF_armv6 = " --enable-armv6 " -EXTRA_OECONF_armv7a = --enable-armv6" +EXTRA_OECONF_armv7a = " --enable-armv6" #build with support for the iwmmxt instruction and pxa270fb overlay support (pxa270 and up) #not every iwmmxt machine has the lcd connected to pxafb, but building the module doesn't hurt diff --git a/packages/neuros-public/neuros-lib-widgets_git.bb b/packages/neuros-public/neuros-lib-widgets_git.bb index 0e1e22e6d2..45dde3c14a 100644 --- a/packages/neuros-public/neuros-lib-widgets_git.bb +++ b/packages/neuros-public/neuros-lib-widgets_git.bb @@ -1,6 +1,9 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" +PV = "0.0+${PR}+gitr${SRCREV}" +PR = "r1" + DEPENDS = "qt-embedded" inherit qtopia4core @@ -14,4 +17,7 @@ do_install() { install -m 0755 ${S}/build/lib* ${D}/${libdir} } - +do_stage() { + install -d ${STAGING_LIBDIR} + install -m 0755 ${S}/build/lib* ${STAGING_LIBDIR} +} diff --git a/packages/neuros-public/neuros-mainmenu_git.bb b/packages/neuros-public/neuros-mainmenu_git.bb new file mode 100644 index 0000000000..c16cbeb036 --- /dev/null +++ b/packages/neuros-public/neuros-mainmenu_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Neuros window manager" +LICENSE = "GPL" + +PV = "0.0+${PR}+gitr${SRCREV}" +PR = "r0" + +DEPENDS = "qt-embedded" + +inherit qtopia4core + +SRCREV = "27fc35bd349ccbac1226ebb3d41417d8164b7dd1" +SRC_URI = "git://git.neurostechnology.com/git/app-mainmenu;protocol=git" +S = "${WORKDIR}/git/" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/build/main-menu ${D}/${bindir} + + install -d ${D}/${sysconfdir}/menu + install -m 0644 ${S}/resources/menu/* ${D}/${sysconfdir}/menu +} + + diff --git a/packages/neuros-public/neuros-nwm_git.bb b/packages/neuros-public/neuros-nwm_git.bb new file mode 100644 index 0000000000..6dbbd4cabd --- /dev/null +++ b/packages/neuros-public/neuros-nwm_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Neuros window manager" +LICENSE = "GPL" + +PV = "0.0+${PR}+gitr${SRCREV}" +PR = "r2" + +DEPENDS = "qt-embedded" + +inherit qtopia4core + +SRCREV = "d0b6789dde38d321d3c90c04512a4ea43e28e79e" +SRC_URI = "git://git.neurostechnology.com/git/app-nwm;protocol=git" +S = "${WORKDIR}/git/" + +do_configure_prepend() { + rm ${S}/src/Makefile || true +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/build/nwm ${D}/${bindir} +} diff --git a/packages/neuros-public/neuros-qt-plugins_git.bb b/packages/neuros-public/neuros-qt-plugins_git.bb index d0de64d945..62a9d43fca 100644 --- a/packages/neuros-public/neuros-qt-plugins_git.bb +++ b/packages/neuros-public/neuros-qt-plugins_git.bb @@ -1,7 +1,8 @@ DESCRIPTION = "Neuros qt-plugins" LICENSE = "GPL" -PR = "r1" +PV = "0.0+${PR}+gitr${SRCREV}" +PR = "r2" DEPENDS = "qt-embedded" diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb new file mode 100644 index 0000000000..67adf6e964 --- /dev/null +++ b/packages/nfs-utils/nfs-utils_1.1.2.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "userspace utilities for kernel nfs" +PRIORITY = "optional" +SECTION = "console/network" +LICENSE = "GPL" + +DEPENDS = "tcp-wrappers libevent" + +SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ + file://nfsserver \ + " + +S = "${WORKDIR}/nfs-utils-${PV}/" + +PARALLEL_MAKE = "" + +# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will +# pull in the remainder of the dependencies. +RDEPENDS = "portmap" +RRECOMMENDS = "kernel-module-nfsd" + +INITSCRIPT_NAME = "nfsserver" +# The server has no dependencies at the user run levels, so just put +# it in at the default levels. It must be terminated before the network +# in the shutdown levels, but that works fine. +INITSCRIPT_PARAMS = "defaults" + +inherit autotools update-rc.d + +EXTRA_OECONF = "--with-statduser=nobody \ + --enable-nfsv3 \ + --disable-nfsv4 \ + --disable-gss \ + --with-statedir=/var/lib/nfs" + +do_ccompile() { + # UGLY HACK ALERT + cat ${WORKDIR}/forgotten-defines >> ${S}/support/include/config.h + oe_runmake 'BUILD=1' +} + +INHIBIT_AUTO_STAGE = "1" + +do_install() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver + + install -d ${D}${sbindir} + install -m 0755 ${S}/utils/exportfs/exportfs ${D}${sbindir}/exportfs + install -m 0755 ${S}/utils/mountd/mountd ${D}${sbindir}/mountd + install -m 0755 ${S}/utils/mount/mount.nfs ${D}${sbindir}/mount.nfs + install -m 0755 ${S}/utils/nfsd/nfsd ${D}${sbindir}/nfsd + install -m 0755 ${S}/utils/nfsstat/nfsstat ${D}${sbindir}/nfsstat + install -m 0755 ${S}/utils/showmount/showmount ${D}${sbindir}/showmount + install -m 0755 ${S}/utils/statd/statd ${D}${sbindir}/statd + + install -d ${D}${mandir}/man8 + install -m 0644 ${S}/utils/exportfs/exportfs.man ${D}${mandir}/man8/exportfs.8 + install -m 0644 ${S}/utils/mountd/mountd.man ${D}${mandir}/man8/mountd.8 + install -m 0644 ${S}/utils/nfsd/nfsd.man ${D}${mandir}/man8/nfsd.8 + install -m 0644 ${S}/utils/nfsstat/nfsstat.man ${D}${mandir}/man8/nfsstat.8 + install -m 0644 ${S}/utils/showmount/showmount.man ${D}${mandir}/man8/showmount.8 + install -m 0644 ${S}/utils/statd/statd.man ${D}${mandir}/man8/statd.8 +} diff --git a/packages/python/python-setuptools-native_0.6c8.bb b/packages/python/python-setuptools-native_0.6c8.bb index b7716d8cac..0bbf9c32fc 100644 --- a/packages/python/python-setuptools-native_0.6c8.bb +++ b/packages/python/python-setuptools-native_0.6c8.bb @@ -1,9 +1,9 @@ require python-setuptools_${PV}.bb inherit native +FILESPATH = "${FILE_DIRNAME}/python-setuptools" DEPENDS = "python-native" do_stage() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install + distutils_stage_all } diff --git a/packages/python/python-setuptools/.mtn2git_empty b/packages/python/python-setuptools/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-setuptools/.mtn2git_empty diff --git a/packages/python/python-setuptools/fix-log-usage.patch b/packages/python/python-setuptools/fix-log-usage.patch new file mode 100644 index 0000000000..6363c850c2 --- /dev/null +++ b/packages/python/python-setuptools/fix-log-usage.patch @@ -0,0 +1,13 @@ +Index: setuptools-0.6c8/setuptools/command/sdist.py +=================================================================== +--- setuptools-0.6c8.orig/setuptools/command/sdist.py ++++ setuptools-0.6c8/setuptools/command/sdist.py +@@ -95,7 +95,7 @@ def entries_finder(dirname, filename): + for match in entries_pattern.finditer(data): + yield joinpath(dirname,unescape(match.group(1))) + else: +- log.warn("unrecognized .svn/entries format in %s", dirname) ++ print ("unrecognized .svn/entries format in %s", dirname) + + + finders = [ diff --git a/packages/python/python-setuptools_0.6c8.bb b/packages/python/python-setuptools_0.6c8.bb index 19f73d3f67..5b82ecea69 100644 --- a/packages/python/python-setuptools_0.6c8.bb +++ b/packages/python/python-setuptools_0.6c8.bb @@ -5,9 +5,12 @@ PRIORITY = "optional" LICENSE = "MIT-like" RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" -PR = "ml0" +PR = "ml1" -SRC_URI = "http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "\ + http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz\ + file://fix-log-usage.patch;patch=1 \ +" S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils diff --git a/packages/tcp-wrappers/tcp-wrappers_7.6.bb b/packages/tcp-wrappers/tcp-wrappers_7.6.bb index 047adc23a6..e10d3e8172 100644 --- a/packages/tcp-wrappers/tcp-wrappers_7.6.bb +++ b/packages/tcp-wrappers/tcp-wrappers_7.6.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \ LICENSE = "tcp-wrappers" PRIORITY = "optional" SECTION = "console/network" -PR="r1" +PR="r2" PACKAGES = "${PN}-dbg libwrap libwrap-doc libwrap-dev tcp-wrappers tcp-wrappers-doc" @@ -107,5 +107,6 @@ do_install () { do_stage() { oe_libinstall -C shared -so libwrap ${STAGING_LIBDIR} + install -m 0644 tcpd.h ${STAGING_INCDIR} } diff --git a/packages/vlc/vlc-davinci_0.8.6h.bb b/packages/vlc/vlc-davinci_0.8.6h.bb index beaa2eecd6..6f0308880c 100644 --- a/packages/vlc/vlc-davinci_0.8.6h.bb +++ b/packages/vlc/vlc-davinci_0.8.6h.bb @@ -10,7 +10,7 @@ PR = "r3" PV = "0.8.6h+${PR}+gitr${SRCREV}" -DEPENDS = "dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" +DEPENDS = "codec-engine dbus libxml2 gnutls tremor faad2 ffmpeg flac liba52 libid3tag libmad mpeg2dec" SRC_URI = "git://git.videolan.org/vlc.git;protocol=git;branch=0.8.6-neuros" |