[oe-commits] org.oe.dev dummy ci

florian commit openembedded-commits at lists.openembedded.org
Fri Jan 25 11:58:08 UTC 2008


dummy ci

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 1db951a66d993086346a502253112d6a52d1ad3f
ViewMTN: http://monotone.openembedded.org/revision/info/1db951a66d993086346a502253112d6a52d1ad3f
Files:
1
packages/linux/mainstone-kernel/mainstone_defconfig
packages/busybox/busybox-1.2.1/avr32
packages/avahi/files/avr32-ipv6-fix.patch
packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch
packages/uclibc/uclibc-0.9.28/avr32/avr32-arch-2.patch
packages/uclibc/uclibc-0.9.28/avr32/avr32-linkrelax-option.patch
packages/uclibc/uclibc-0.9.28/avr32/avr32-string-ops.patch
packages/uclibc/uclibc-0.9.28/avr32/fix-__libc_fcntl64-varargs-prototype.patch
packages/uclibc/uclibc-0.9.28/avr32/fix-broken-__libc_open-declaration.patch
packages/uclibc/uclibc-0.9.28/avr32/fix-getrusage-argument-type.patch
packages/uclibc/uclibc-0.9.28/avr32/ldd-avr32-support.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-always-inline-_dl_memcpy.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-always-inline-syscalls.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-2.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-needs-CONSTANT_STRING_GOT_FIXUP.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-startup-hack.patch
packages/uclibc/uclibc-0.9.28/avr32/ldso-define-MAP_FAILED.patch
packages/uclibc/uclibc-0.9.28/avr32/let-optimized-stringops-override-default-ones.patch
packages/uclibc/uclibc-0.9.28/avr32/libpthread-avr32.patch
packages/uclibc/uclibc-0.9.28/avr32/no-create_module-on-avr32.patch
packages/uclibc/uclibc-0.9.28/avr32/remove-bogus-version-hack-and-just-use-asm-generic-if-it-exists.patch
packages/uclibc/uclibc-0.9.28/avr32/sync-fcntl-h-with-linux-kernel.patch
packages/uclibc/uclibc-0.9.28/avr32/uClibc-0.9.28-avr32-20060621.patch
packages/uclibc/uclibc-0.9.28/avr32/uClibc-0.9.28-avr32-20061019.patch
packages/uclibc/uclibc-0.9.28/avr32/uclibc-avr32-kernheaders.spec
packages/uclibc/uclibc-0.9.28/avr32/uclibc-avr32-no-msoft-float.patch
packages/uclibc/uclibc-0.9.28/avr32/uclibc-makefile.patch
packages/util-linux/files/fdiskbsdlabel-avr32.patch
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/angstrom.inc
conf/machine/at32stk1000.conf
conf/machine/atngw100.conf
packages/avahi/avahi_0.6.21.bb
packages/binutils/binutils_2.17.bb
packages/busybox/busybox-1.7.2/angstrom/defconfig
packages/busybox/busybox_1.2.1.bb
packages/fuse/gmailfs.inc
packages/gcc/gcc-cross_4.1.2.bb
packages/gcc/gcc-package-cross.inc
packages/gcc/gcc-package.inc
packages/gcc/gcc_4.1.2.bb
packages/gcc/gcc_4.2.1.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/gtk+/gtk+_2.10.14.bb
packages/gtk+/gtk+_2.12.0.bb
packages/hwdata/hwdata_0.191.bb
packages/libmad/libmad_0.15.1b.bb
packages/linux/linux_2.6.23.bb
packages/linux/mainstone-kernel_2.6.18.bb
packages/mplayer/mplayer_0.0+1.0rc1.bb
packages/tasks/task-gpephone.bb
packages/tasks/task-sdk-base.bb
packages/tasks/task-sdk-gpephone.bb
packages/tea/tea_17.3.5.bb
packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch
packages/uclibc/uclibc-0.9.28/avr32/uClibc.config
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_0.9.28.bb
packages/util-linux/util-linux_2.12r.bb
packages/xorg-font/xfonts-xorg_6.8.bb
packages/xorg-lib/libx11-native_1.0.1.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
site/avr32-common
Diffs:

#
# mt diff -rb530b781e2597a57e49d9d02d956a75f0617c9a8 -r1db951a66d993086346a502253112d6a52d1ad3f
#
# 
# 
# delete "packages/linux/mainstone-kernel/mainstone_defconfig"
# 
# add_dir "packages/busybox/busybox-1.2.1/avr32"
# 
# add_file "packages/avahi/files/avr32-ipv6-fix.patch"
#  content [b25ec032f0b348397e0a7a9e7a286b138000fb9e]
# 
# add_file "packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch"
#  content [876315cc7ea35c174e273748e709d64dc97d68d9]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/avr32-arch-2.patch"
#  content [b73c6cf87001866b8542a5ff6a93f3e02dfa9f65]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/avr32-linkrelax-option.patch"
#  content [2f9264ccf8ef44743af6ca3a1cdf27fc8fcd8241]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/avr32-string-ops.patch"
#  content [5fae94e40475f1af5df5db9c99c380120e74991f]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/fix-__libc_fcntl64-varargs-prototype.patch"
#  content [348b1b66d21fb8705eb10d07397ddf7ee197d6f8]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/fix-broken-__libc_open-declaration.patch"
#  content [c0d513a699f6dabf8883a606b9588a3a42a7fdc1]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/fix-getrusage-argument-type.patch"
#  content [53ad30522dbdedd301e5e668dce88784a48f1fcb]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldd-avr32-support.patch"
#  content [9fc4c962838e8d3f57a76d57a6aa53ffea7b8117]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-always-inline-_dl_memcpy.patch"
#  content [eac0ec00999e5a7a5e920a40d324aac6c68d1e25]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-always-inline-syscalls.patch"
#  content [fe593d5cb24e4b3eee2a0c3df5f9bc02d0b883d9]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-2.patch"
#  content [ff5efe89fa84688ac27ab77f153319139a94fb14]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-needs-CONSTANT_STRING_GOT_FIXUP.patch"
#  content [11ed5b646cd9cf0615f2cecd322b074b9db85a1a]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-avr32-startup-hack.patch"
#  content [325126d2b43b63e9ee725bbedbc46ff8d8e77d11]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/ldso-define-MAP_FAILED.patch"
#  content [fd16565b07cd15a1c936b58ea45a0b61619f787a]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/let-optimized-stringops-override-default-ones.patch"
#  content [6597d08ccac6918a89d4773965b1661ecd34bfa1]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/libpthread-avr32.patch"
#  content [92d2944519d9f1ed5ce260915cf28125ff11f4da]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/no-create_module-on-avr32.patch"
#  content [168d60ba5a6b3bb1ccb2177c96ad989b17ff2411]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/remove-bogus-version-hack-and-just-use-asm-generic-if-it-exists.patch"
#  content [0130cb3b4de94ad8d5e77e7d8370e328ef1b860c]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/sync-fcntl-h-with-linux-kernel.patch"
#  content [7b07e130f84249d89904bf90c0a2d115ea3db9bb]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/uClibc-0.9.28-avr32-20060621.patch"
#  content [b27c31c62fb9a336a75f0335e756d8da9d0a2ab9]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/uClibc-0.9.28-avr32-20061019.patch"
#  content [8759b7aca85c81ded55e481664858fa881a2df33]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/uclibc-avr32-kernheaders.spec"
#  content [289626028b36f7ce5d33e4d390d0e7bc67901ff6]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/uclibc-avr32-no-msoft-float.patch"
#  content [215ea42a1ebd9596871f92ecca80a355306a6433]
# 
# add_file "packages/uclibc/uclibc-0.9.28/avr32/uclibc-makefile.patch"
#  content [2c19928703ea11c46e0b7d1fbb7f98a1b9a3b9d2]
# 
# add_file "packages/util-linux/files/fdiskbsdlabel-avr32.patch"
#  content [b0d2afa882e680e4be4fff1ab6016d9ea30e0618]
# 
# patch "conf/distro/include/angstrom-uclibc.inc"
#  from [acd77cb1b7ff38f08af7ea0f756e371ee8730a48]
#    to [bd467a8983d81901f98163052c0537bbf2909f15]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [d7101c0944e02681c38c2ba79d8a78e3d4005df9]
#    to [4d1526781ebb7597c88e73634334df7f541a5e6b]
# 
# patch "conf/machine/at32stk1000.conf"
#  from [05b0bc339df4d5de0c109f42be8cae71aa14ac2c]
#    to [ef27dae8874a54216b87007d17d0e99660400f4d]
# 
# patch "conf/machine/atngw100.conf"
#  from [027f776421cc5f24af9fcf738db756347a30c733]
#    to [733b58380532065056c1b4b9d8b3f6f4a1c11f8d]
# 
# patch "packages/avahi/avahi_0.6.21.bb"
#  from [5650246fb735e81ed906707d2b67bb821765b83c]
#    to [0c0e3bca847dc2a17de283ac8228facff54df0ab]
# 
# patch "packages/binutils/binutils_2.17.bb"
#  from [1075599deaaf23f14f3fea5a4869029f8fa7c07c]
#    to [b221c1f76176e30933b227951e0ebee85e3033b1]
# 
# patch "packages/busybox/busybox-1.7.2/angstrom/defconfig"
#  from [d500c2dcc78577bcce9fe928b8542d34bd58eb89]
#    to [8ff46b0ea2ff1d1e102617d6956e6475d11838e9]
# 
# patch "packages/busybox/busybox_1.2.1.bb"
#  from [160317aa572262fe79f5bcad397356e713e225e0]
#    to [987a597ce6f20e1fede26562311f1e50fd7834ab]
# 
# patch "packages/fuse/gmailfs.inc"
#  from [eea2121db172f080b166ec29b63d248ae0e19561]
#    to [69d4a1cdb3ebc1a1fe898172c6a3bc1e1f243c09]
# 
# patch "packages/gcc/gcc-cross_4.1.2.bb"
#  from [110264dc0f77a52cf1c9af1c384778715c290d17]
#    to [e659d9e6674737d1b04faad23ba65c74a3626216]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [02ed46babec84d115ccdf2185b7c2a9364953092]
#    to [74d7c12ed4f23d683bd26cd00ec7023f4a4e79cf]
# 
# patch "packages/gcc/gcc-package.inc"
#  from [760299e5f8168507c53a5d73b89438f7a75d5c7c]
#    to [1cc2816065e59a4b33fa88fb69ad95372838e537]
# 
# patch "packages/gcc/gcc_4.1.2.bb"
#  from [66c1a6be00672f5a37ab8c37aaee4c3c6b0713d6]
#    to [e59d3a8f06eb5ab8da6c507b3194bde070178cbf]
# 
# patch "packages/gcc/gcc_4.2.1.bb"
#  from [755943c06b7920f669b3a3f3e1baf2e9d2a97645]
#    to [5bc82772c3661aed0a736f5132b4bcfb72bad28f]
# 
# patch "packages/gpephone/libmsgenabler2_svn.bb"
#  from [98732dfed57aec57dd1b60c208b0540f3fc15122]
#    to [4b054d845c6af29f6fa410f2c30a8d867c6e4d59]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
#    to [60392f910d2516067f1b670c648131c6fefb39cd]
# 
# patch "packages/gtk+/gtk+_2.12.0.bb"
#  from [08e63663afbf9b3a26edfaf43148e2e60683e7df]
#    to [fcfd128f9a8f028518650d7e1b5fb57f7e294d2a]
# 
# patch "packages/hwdata/hwdata_0.191.bb"
#  from [75972da3f9c8058b901b63c5530afa723f824921]
#    to [a4e6f065bfb933c005991e7b3698b9b17758f174]
# 
# patch "packages/libmad/libmad_0.15.1b.bb"
#  from [5b598bbbc42cb275540ce3924b29853aa0fd5258]
#    to [403ecc62d5f15da2c289cc140ff8f194615bfb1c]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [b060aceb9f60701b044dbfe175116aa95b285aa5]
#    to [1e95f336424a59ba217de3efd73da3362a7c9c63]
# 
# patch "packages/linux/mainstone-kernel_2.6.18.bb"
#  from [06ce52f0eac17560e7f0c7163cfdd585c005ac3c]
#    to [0b9817fc96959e190b3f0ed7775eee1220dd2048]
# 
# patch "packages/mplayer/mplayer_0.0+1.0rc1.bb"
#  from [9378af60d35a2d2c248760fadc6a2f095991bdca]
#    to [c228f31728ecf2e1a347df4bc148917394df34a1]
# 
# patch "packages/tasks/task-gpephone.bb"
#  from [ddab25d4b41aeebd7cee7193c7ef2922532c17ea]
#    to [74ee108af6066eada7baafef1ee807854bb1c56c]
# 
# patch "packages/tasks/task-sdk-base.bb"
#  from [b9a1559ed5d3757201e7a2cf6103eca7813cdce1]
#    to [96b5ba26d26aa073d7d87bcb154648775609944e]
# 
# patch "packages/tasks/task-sdk-gpephone.bb"
#  from [ceb091b7158defcc81f45d9b1a2fdf86d31c7f95]
#    to [7cf62c2bc99d352317f17516493495e8ac6b82b5]
# 
# patch "packages/tea/tea_17.3.5.bb"
#  from [2c12d2003ebdd187f9684fc6d6395660ab825f46]
#    to [ff06e9db35bc7a0d82f2716e6b64d47a830abb4e]
# 
# patch "packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch"
#  from [dc5f4bcf860821ddb50ef7fc434e992a6fe059b5]
#    to [c800b0de8526fd1902db23bcd320b49bb1412522]
# 
# patch "packages/uclibc/uclibc-0.9.28/avr32/uClibc.config"
#  from [f76ae1e1cbdb4ed9932ae16cacf8ba2bd5f7fa91]
#    to [a866c194a76ffe6135a356b098bc02b35f76182a]
# 
# patch "packages/uclibc/uclibc.inc"
#  from [5c336b467c3dc6d7c09520eadca98583a16be540]
#    to [c9c79ae76287d39c4c0f25cd721cd57d7f5305bb]
# 
# patch "packages/uclibc/uclibc_0.9.28.bb"
#  from [49cbae94a945618f51290994796d0ef210187c80]
#    to [b04a09d0bf752830bae4c350abe0c396ea34005f]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [f6fbb55ffc20768be6397e3ce9d25b88de00f9a8]
#    to [cd1ffadd74407478ab993df8ff54255f5470ed57]
# 
# patch "packages/xorg-font/xfonts-xorg_6.8.bb"
#  from [c4add068e89e6e3806342a21e7a90f1df5cb42e9]
#    to [d144d99b66588a9dd0ce7790e3ed46e3126de7e2]
# 
# patch "packages/xorg-lib/libx11-native_1.0.1.bb"
#  from [7c117d26c8901c44e5cebd665e12dfc191784a6d]
#    to [cb90f74031b2b61284cce0580189e742f3715b8f]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [646528aff2b8e45f44e9fc625cfb5816473ad872]
#    to [25f3216865ba751c5ca388f61a15802f72cd7ff6]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  from [58d9f93157413d0ca323b5aeb9132e14c6bf0210]
#    to [c8df66fc28ad69123340b7acdf08b827bc631c09]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [3f44a727a1525cb60f6aa240c365271b2658798b]
#    to [fc1b8a97acf55bb4abc9d1d2ad120b71d1d4f15a]
# 
# patch "site/avr32-common"
#  from [4f8f5cf5368a3611f7602bc763f50cf8f670f852]
#    to [545ef01a4fb0edbd7253e091ab328b8acdc99dbe]
# 
============================================================
--- packages/avahi/files/avr32-ipv6-fix.patch	b25ec032f0b348397e0a7a9e7a286b138000fb9e
+++ packages/avahi/files/avr32-ipv6-fix.patch	b25ec032f0b348397e0a7a9e7a286b138000fb9e
@@ -0,0 +1,42 @@
+--- /tmp/socket.c	2007-09-14 14:03:01.395330465 +0200
++++ avahi-0.6.21/avahi-core/socket.c	2007-09-14 14:08:42.081140297 +0200
+@@ -66,6 +66,39 @@
+ #endif
+ #endif
+ 
++#define IPV6_ADDRFORM           1
++#define IPV6_2292PKTINFO        2
++#define IPV6_2292HOPOPTS        3
++#define IPV6_2292DSTOPTS        4
++#define IPV6_2292RTHDR          5
++#define IPV6_2292PKTOPTIONS     6
++#define IPV6_CHECKSUM           7
++#define IPV6_2292HOPLIMIT       8
++#define IPV6_NEXTHOP            9
++#define IPV6_AUTHHDR            10      /* obsolete */
++#define IPV6_FLOWINFO           11
++
++#define IPV6_UNICAST_HOPS       16
++#define IPV6_MULTICAST_IF       17
++#define IPV6_MULTICAST_HOPS     18
++#define IPV6_MULTICAST_LOOP     19
++#define IPV6_ADD_MEMBERSHIP     20
++#define IPV6_DROP_MEMBERSHIP    21
++#define IPV6_ROUTER_ALERT       22
++#define IPV6_MTU_DISCOVER       23
++#define IPV6_MTU                24
++#define IPV6_RECVERR            25
++#define IPV6_V6ONLY             26
++#define IPV6_JOIN_ANYCAST       27
++#define IPV6_LEAVE_ANYCAST      28
++
++/* IPV6_MTU_DISCOVER values */
++#define IPV6_PMTUDISC_DONT              0
++#define IPV6_PMTUDISC_WANT              1
++#define IPV6_PMTUDISC_DO                2
++#define IPV6_PMTUDISC_PROBE             3
++
++
+ static void mdns_mcast_group_ipv4(struct sockaddr_in *ret_sa) {
+     assert(ret_sa);
+ 
============================================================
--- packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch	876315cc7ea35c174e273748e709d64dc97d68d9
+++ packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch	876315cc7ea35c174e273748e709d64dc97d68d9
@@ -0,0 +1,6444 @@
+ cfg-common.h                     |    4 +
+ cfg-mencoder.h                   |    4 +
+ cfg-mplayer.h                    |    4 +
+ configure                        |   13 +-
+ libaf/af_format.c                |    7 +
+ libavcodec/Makefile              |    7 +
+ libavcodec/avr32/dsputil_avr32.c | 2678 ++++++++++++++++++++++++++++++++++++++
+ libavcodec/avr32/fdct.S          |  541 ++++++++
+ libavcodec/avr32/h264idct.S      |  451 +++++++
+ libavcodec/avr32/idct.S          |  829 ++++++++++++
+ libavcodec/avr32/mc.S            |  434 ++++++
+ libavcodec/avr32/pico.h          |  260 ++++
+ libavcodec/bitstream.h           |   77 +-
+ libavcodec/dsputil.c             |    3 +
+ libavcodec/h264.c                |   15 +
+ libavutil/common.h               |   16 +
+ libavutil/internal.h             |    9 +
+ libfaad2/common.h                |    2 +-
+ libmpcodecs/ad_libmad.c          |    5 +
+ libswscale/pico-avr32.h          |  137 ++
+ libswscale/swscale_internal.h    |    2 +-
+ libswscale/yuv2rgb.c             |   14 +
+ libswscale/yuv2rgb_avr32.c       |  416 ++++++
+ libvo/vo_fbdev2.c                |  101 ++-
+ version.sh                       |    2 +-
+ 25 files changed, 6011 insertions(+), 20 deletions(-)
+ create mode 100644 libavcodec/avr32/dsputil_avr32.c
+ create mode 100644 libavcodec/avr32/fdct.S
+ create mode 100644 libavcodec/avr32/h264idct.S
+ create mode 100644 libavcodec/avr32/idct.S
+ create mode 100644 libavcodec/avr32/mc.S
+ create mode 100644 libavcodec/avr32/pico.h
+ create mode 100644 libswscale/pico-avr32.h
+ create mode 100644 libswscale/yuv2rgb_avr32.c
+
+diff --git a/cfg-common.h b/cfg-common.h
+index 780df38..7d878a8 100644
+--- a/cfg-common.h
++++ b/cfg-common.h
+@@ -235,6 +235,10 @@
+ 	{"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL},
+ 	{"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 
++#ifdef ARCH_AVR32
++        {"use-pico", &avr32_use_pico, CONF_TYPE_FLAG, 0, 0, 1, NULL},
++        {"nouse-pico", &avr32_use_pico, CONF_TYPE_FLAG, 0, 1, 0, NULL},
++#endif
+ 	// draw by slices or whole frame (useful with libmpeg2/libavcodec)
+ 	{"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ 	{"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+diff --git a/cfg-mencoder.h b/cfg-mencoder.h
+index 411b748..addf791 100644
+--- a/cfg-mencoder.h
++++ b/cfg-mencoder.h
+@@ -5,6 +5,10 @@
+ 
+ #include "cfg-common.h"
+ 
++#ifdef ARCH_AVR32
++extern int avr32_use_pico;
++#endif
++
+ #ifdef USE_FAKE_MONO
+ extern int fakemono; // defined in dec_audio.c
+ #endif
+diff --git a/cfg-mplayer.h b/cfg-mplayer.h
+index 62b6eac..31499c2 100644
+--- a/cfg-mplayer.h
++++ b/cfg-mplayer.h
+@@ -4,6 +4,10 @@
+ 
+ #include "cfg-common.h"
+ 
++#ifdef ARCH_AVR32
++extern int avr32_use_pico;
++#endif
++
+ extern int noconsolecontrols;
+ 
+ #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
+diff --git a/configure b/configure
+index 29002c8..56c6fe4 100755
+--- a/configure
++++ b/configure
+@@ -1203,6 +1203,15 @@ EOF
+     _optimizing="$proc"
+     ;;
+ 
++  avr32)
++    _def_arch='#define ARCH_AVR32'
++    _target_arch='TARGET_ARCH_AVR32 = yes'
++    iproc='avr32'
++    proc=''
++    _march=''
++    _mcpu=''
++    _optimizing=''
++    ;;
+   arm|armv4l|armv5tel)
+     _def_arch='#define ARCH_ARMV4L 1'
+     _target_arch='TARGET_ARCH_ARMV4L = yes'
+@@ -1533,7 +1542,7 @@ echores $_named_asm_args
+ # Checking for CFLAGS
+ _stripbinaries=yes
+ if test "$_profile" != "" || test "$_debug" != "" ; then
+-  CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
++  CFLAGS="-W -Wall -O4 $_march $_mcpu $_debug $_profile"
+   if test "$_cc_major" -ge "3" ; then
+     CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
+   fi
+@@ -3794,7 +3803,7 @@ fi
+ 
+ 
+ echocheck "X11 headers presence"
+-  for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do
++  for I in `echo $_inc_extra | sed s/-I//g`; do
+     if test -f "$I/X11/Xlib.h" ; then
+       _inc_x11="-I$I"
+       _x11_headers="yes"
+diff --git a/libaf/af_format.c b/libaf/af_format.c
+index e5b7cc9..5d7ea6d 100644
+--- a/libaf/af_format.c
++++ b/libaf/af_format.c
+@@ -20,7 +20,14 @@
+ // Integer to float conversion through lrintf()
+ #ifdef HAVE_LRINTF
+ #include <math.h>
++
++#ifdef ARCH_AVR32
++#define lrintf(x) rint(x)
++#define llrint(x) (long long)rint(x) 
++#else
+ long int lrintf(float);
++#endif
++
+ #else
+ #define lrintf(x) ((int)(x))
+ #endif
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 17b6c45..8e1dc96 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -360,6 +360,12 @@ OBJS-$(TARGET_ARCH_SPARC)              += sparc/dsputil_vis.o \
+ 
+ sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+ 
++# avr32 specific stuff
++ifeq ($(TARGET_ARCH_AVR32),yes)
++ASM_OBJS += avr32/idct.o avr32/fdct.o avr32/mc.o avr32/h264idct.o
++OBJS += avr32/dsputil_avr32.o
++endif
++
+ # sun mediaLib specific stuff
+ OBJS-$(HAVE_MLIB)                      += mlib/dsputil_mlib.o \
+ 
+@@ -419,6 +425,7 @@ tests: apiexample $(TESTS)
+ clean::
+ 	rm -f \
+ 	   i386/*.o i386/*~ \
++	   avr32/*.o avr32/*~ \%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list