[oe-commits] org.oe.dev merge of '68b677cc5ae237d521b127e852086eac5d000fd4'

mickeyl commit openembedded-commits at lists.openembedded.org
Sat Jul 21 14:45:07 UTC 2007


merge of '68b677cc5ae237d521b127e852086eac5d000fd4'
     and 'e520909be2622e4bbdf3326729ffc870686d568e'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 15a71bc10dfda511628c2bd03cad08430b3f8cb0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=15a71bc10dfda511628c2bd03cad08430b3f8cb0
Files:
1
packages/initrdscripts/initramfs-nfsboot_0.2.bb
packages/jack/jack_0.99.0.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
packages/qte/qte-2.3.10/c700-hardware.patch
packages/qte/qte-2.3.10/deprecated/c700-hardware.patch
packages/qte/qte-2.3.10/kernel-keymap-CXK.patch
packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch
packages/qte/qte-2.3.10/simpad-defaultkbd.patch
packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch
packages/qte/qte-2.3.10/simpad.patch
packages/qte/qte-2.3.10/deprecated/simpad.patch
packages/brutefir
packages/brutefir/files
packages/initrdscripts/initramfs-jffs2
packages/openobex/openobex-1.3
packages/uclibc/uclibc-0.9.29/palmld
packages/uclibc/uclibc-0.9.29/palmz31
packages/uclibc/uclibc-0.9.29/palmz72
packages/bluez/files/pkgconfig-add-gthread.patch
packages/brutefir/brutefir_1.0i.bb
packages/brutefir/files/unbreak-makefile.patch
packages/coreutils/coreutils-5.3.0/futimens.patch
packages/fftw/benchfft_3.1.bb
packages/fftw/fftw.inc
packages/fftw/fftwf_3.1.2.bb
packages/fftw/fftwl_3.1.2.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-vfs-obexftp_0.4.bb
packages/initrdscripts/files/blockboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/files/loopboot.sh
packages/initrdscripts/initramfs-jffs2/jffs2boot.sh
packages/initrdscripts/initramfs-jffs2_0.1.bb
packages/initrdscripts/initramfs-module-block_0.1.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
packages/initrdscripts/initramfs-uniboot_0.2.bb
packages/jack/jack_0.103.0.bb
packages/linux/linux-handhelds-2.6/asus730/defconfig
packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch
packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb
packages/openobex/openobex-1.3/libusb_crosscompile_check.patch
packages/openobex/openobex_1.3.bb
packages/qte/qte-2.3.10/remove-unused-kbdhandler.patch
packages/sylpheed/claws-mail.inc
packages/sylpheed/claws-mail_2.9.1.bb
packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb
packages/sylpheed/claws-plugin-mailmbox_1.13.bb
packages/sylpheed/claws-plugin-rssyl_0.13.bb
packages/sylpheed/files/desktop.patch
packages/sylpheed/files/streamline-ui.patch
packages/uclibc/uclibc-0.9.29/palmld/uClibc.machine
packages/uclibc/uclibc-0.9.29/palmz31/uClibc.machine
packages/uclibc/uclibc-0.9.29/palmz72/uClibc.machine
conf/distro/angstrom-2007.1.conf
conf/machine/hx4700.conf
conf/machine/spitz.conf
packages/bluez/bluez-utils_3.12.bb
packages/clutter/clutter_svn.bb
packages/coreutils/coreutils_5.3.0.bb
packages/fftw/fftw_3.1.2.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/images/devimage-image.bb
packages/initrdscripts/files/nfsboot.sh
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/linux-hackndev-2.6/palmt650/defconfig
packages/linux/linux-hackndev-2.6_svn.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/openobex/openobex_1.2.bb
packages/opie-taskbar/opie-taskbar-images.inc
packages/opie-taskbar/opie-taskbar-images_cvs.bb
packages/qte/qte-2.3.10/key.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/tasks/task-gpe.bb
packages/tasks/task-opie.bb
packages/efl1/edje-native_0.5.0.038.bb
packages/efl1/edje-native_0.5.0.040.bb
packages/efl1/edje_0.5.0.038.bb
packages/efl1/edje_0.5.0.040.bb
packages/efl1/eet-native_0.9.10.038.bb
packages/efl1/eet-native_0.9.10.040.bb
packages/efl1/eet_0.9.10.038.bb
packages/efl1/eet_0.9.10.040.bb
packages/efl1/efreet_0.0.3.002.bb
packages/efl1/efreet_0.0.3.005.bb
packages/efl1/embryo-native_0.9.1.038.bb
packages/efl1/embryo-native_0.9.1.040.bb
packages/efl1/embryo_0.9.1.038.bb
packages/efl1/embryo_0.9.1.040.bb
packages/efl1/emotion_0.0.1.006.bb
packages/efl1/emotion_0.0.1.007.bb
packages/efl1/epeg_0.9.0.009.bb
packages/efl1/epeg_0.9.0.010.bb
packages/efl1/epsilon_0.3.0.009.bb
packages/efl1/epsilon_0.3.0.010.bb
packages/efl1/esmart_0.9.0.009.bb
packages/efl1/esmart_0.9.0.010.bb
packages/efl1/evas-native_0.9.9.038.bb
packages/efl1/evas-native_0.9.9.040.bb
packages/efl1/evas_0.9.9.038.bb
packages/efl1/evas_0.9.9.040.bb
packages/efl1/ewl_0.5.1.009.bb
packages/efl1/ewl_0.5.1.010.bb
packages/efl1/imlib2_1.4.0.001.bb
packages/efl1/imlib2_1.4.0.002.bb
classes/efl1.bbclass
packages/efl1/evas.inc
Diffs:

#
# mt diff -r68b677cc5ae237d521b127e852086eac5d000fd4 -r15a71bc10dfda511628c2bd03cad08430b3f8cb0
#
# 
# 
# delete "packages/initrdscripts/initramfs-nfsboot_0.2.bb"
# 
# delete "packages/jack/jack_0.99.0.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb"
# 
# rename "packages/images/initramfs-image.bb"
#     to "packages/images/initramfs-minimal-image.bb"
# 
# rename "packages/qte/qte-2.3.10/c700-hardware.patch"
#     to "packages/qte/qte-2.3.10/deprecated/c700-hardware.patch"
# 
# rename "packages/qte/qte-2.3.10/kernel-keymap-CXK.patch"
#     to "packages/qte/qte-2.3.10/spitz-adhoc-keypad-rotate.patch"
# 
# rename "packages/qte/qte-2.3.10/simpad-defaultkbd.patch"
#     to "packages/qte/qte-2.3.10/deprecated/simpad-defaultkbd.patch"
# 
# rename "packages/qte/qte-2.3.10/simpad.patch"
#     to "packages/qte/qte-2.3.10/deprecated/simpad.patch"
# 
# add_dir "packages/brutefir"
# 
# add_dir "packages/brutefir/files"
# 
# add_dir "packages/initrdscripts/initramfs-jffs2"
# 
# add_dir "packages/openobex/openobex-1.3"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/palmld"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/palmz31"
# 
# add_dir "packages/uclibc/uclibc-0.9.29/palmz72"
# 
# add_file "packages/bluez/files/pkgconfig-add-gthread.patch"
#  content [6c09cd3241b74b602c6af47bd99cbda71e53d7e0]
# 
# add_file "packages/brutefir/brutefir_1.0i.bb"
#  content [e02d07dc7527439ee60d4c2ec25ba9b3d2df741b]
# 
# add_file "packages/brutefir/files/unbreak-makefile.patch"
#  content [9c157900ebf91a297ad7a7bf8fe5dd7ff5295685]
# 
# add_file "packages/coreutils/coreutils-5.3.0/futimens.patch"
#  content [8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86]
# 
# add_file "packages/fftw/benchfft_3.1.bb"
#  content [217cacf7b83c2dc1f5305f68779e0bb8dd9a44d8]
# 
# add_file "packages/fftw/fftw.inc"
#  content [fd1e65219e8415019bf58f4cff66f95e24a573ff]
# 
# add_file "packages/fftw/fftwf_3.1.2.bb"
#  content [8b9e0d8e0c9788de24eec682ebc1c2b897d83550]
# 
# add_file "packages/fftw/fftwl_3.1.2.bb"
#  content [cbb3b2f901085c4fd786e40cd6384b1f2ea2bdd4]
# 
# add_file "packages/gnome/gnome-desktop_2.18.3.bb"
#  content [aedf2dc2ff050fdb7531f504b91874001a221108]
# 
# add_file "packages/gnome/gnome-vfs-obexftp_0.4.bb"
#  content [555b36870f62cdd554674dc129e98b5c699c50c9]
# 
# add_file "packages/images/initramfs-image.bb"
#  content [58e79ba3a3834ad8830c0866be9d5e351880e916]
# 
# add_file "packages/initrdscripts/files/blockboot.sh"
#  content [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
# 
# add_file "packages/initrdscripts/files/init.sh"
#  content [71313983c36c150465f7a9caca6f672da5828e4a]
# 
# add_file "packages/initrdscripts/files/loopboot.sh"
#  content [895a6f6b6aebecbc1064e069019e70f93c8e380a]
# 
# add_file "packages/initrdscripts/initramfs-jffs2/jffs2boot.sh"
#  content [d52425b59cb253661ac2548077becd69997515eb]
# 
# add_file "packages/initrdscripts/initramfs-jffs2_0.1.bb"
#  content [1eab8e522ee185522c577729e8ac079c6c85c207]
# 
# add_file "packages/initrdscripts/initramfs-module-block_0.1.bb"
#  content [506cedb83f5ba312f8f4a1a21d4261aee9a4b661]
# 
# add_file "packages/initrdscripts/initramfs-module-loop_0.1.bb"
#  content [059299818279ed5cf15ee036428984466bf1095b]
# 
# add_file "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#  content [a2dd01c80a8348aedad1614f86d21641e971fb25]
# 
# add_file "packages/initrdscripts/initramfs-uniboot_0.2.bb"
#  content [c9fb5cdf0e7c885832b90ab85385224531969248]
# 
# add_file "packages/jack/jack_0.103.0.bb"
#  content [38301156b99692f53152d7bda1cbe2c7070d0e11]
# 
# add_file "packages/linux/linux-handhelds-2.6/asus730/defconfig"
#  content [1d826b21a36e2a699158ad95dd884c96e5c6213b]
# 
# add_file "packages/linux/linux-handhelds-2.6/h2200/hamcop-h11.patch"
#  content [2fb28953487d15d1a64f6ac3e5745d9672a020e0]
# 
# add_file "packages/linux/linux-handhelds-2.6/htchimalaya/defconfig"
#  content [ba9099f21f39b36f3c79d65ef6a464a115904bbe]
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
# add_file "packages/openobex/openobex-1.3/libusb_crosscompile_check.patch"
#  content [806a66d6387725e35426e814ed3d4aed84d1bf09]
# 
# add_file "packages/openobex/openobex_1.3.bb"
#  content [a54af39b7b65c24dffc5e3e76748b02caa9a345d]
# 
# add_file "packages/qte/qte-2.3.10/remove-unused-kbdhandler.patch"
#  content [a915ca41b4ad27f24ea5b343636be8f771897f74]
# 
# add_file "packages/sylpheed/claws-mail.inc"
#  content [70dc56c3455d2a0844a513547e62dd0a066acb6f]
# 
# add_file "packages/sylpheed/claws-mail_2.9.1.bb"
#  content [9c76d7640bf39645ce37ffa98021de5d835b2427]
# 
# add_file "packages/sylpheed/claws-plugin-gtkhtml2-viewer_0.15.bb"
#  content [d73fb5b9c737c95ee038731dd97b16a271288e97]
# 
# add_file "packages/sylpheed/claws-plugin-mailmbox_1.13.bb"
#  content [c30ec52d9c35c4540aaab1048d113479f86fd866]
# 
# add_file "packages/sylpheed/claws-plugin-rssyl_0.13.bb"
#  content [d11e21e5ff03c258c29f668c8416de99cd346425]
# 
# add_file "packages/sylpheed/files/desktop.patch"
#  content [55d0bbbe039f37d150f9574de2d124fc9d1c16e4]
# 
# add_file "packages/sylpheed/files/streamline-ui.patch"
#  content [6f7fed506bb96c5de5538ebb8ec4ecd4e7cba24f]
# 
# add_file "packages/uclibc/uclibc-0.9.29/palmld/uClibc.machine"
#  content [b1e518a7f7fc0366b00ae228821d77e0a0d1ff56]
# 
# add_file "packages/uclibc/uclibc-0.9.29/palmz31/uClibc.machine"
#  content [55b4a5c7c3dcf81fc96e330e74fc84374f0bc276]
# 
# add_file "packages/uclibc/uclibc-0.9.29/palmz72/uClibc.machine"
#  content [b1e518a7f7fc0366b00ae228821d77e0a0d1ff56]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [4f1751db4fd4753a555b5926606037d8cd0d71dc]
#    to [bc35278cf8c5d44e6ab31bce0f0b305c606887ef]
# 
# patch "conf/machine/hx4700.conf"
#  from [a98297fd1c958ca100de38bd071c622423c22d11]
#    to [7fc3dbf7c795d1c23929a02c6fb2d560d8674018]
# 
# patch "conf/machine/spitz.conf"
#  from [0774bb1854881b48179ff35042a7145465097e32]
#    to [fb942cabc090e6ba0dd98dc4a57d07867813a6ed]
# 
# patch "packages/bluez/bluez-utils_3.12.bb"
#  from [bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458]
#    to [d72dc2f2275e92d866ac373559154ce93edfd074]
# 
# patch "packages/clutter/clutter_svn.bb"
#  from [583618b5428b11ee203f421217829819e350ccd6]
#    to [e95e5fdb28ed0f924a7af0b83340d372125ad4fd]
# 
# patch "packages/coreutils/coreutils_5.3.0.bb"
#  from [e3c222c8a27658bb6f3092680fe67a444fd60c47]
#    to [2223f1c92c49c889593d31301609cfa7d888d1cb]
# 
# patch "packages/fftw/fftw_3.1.2.bb"
#  from [e7cebedac060c2dbed5446c86c5053301e69495f]
#    to [605d70a727ddd9ed2d7c211db0701ff3dd5148e6]
# 
# patch "packages/gstreamer/gst-plugins-base_0.10.12.bb"
#  from [869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38]
#    to [42b568147310d58a2ca061df2db79c873973b472]
# 
# patch "packages/images/devimage-image.bb"
#  from [e7df38db8d9f517f454ccf08a2c09078f3fdc580]
#    to [c36b2b99ac445dcaf5b0c56269ba22ed9f01f062]
# 
# patch "packages/initrdscripts/files/nfsboot.sh"
#  from [afb73401091d5a724bee10191fa902d1a44e7658]
#    to [cc74b5caa9ab77aa37036dc350e5b6aea94c0f7a]
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [c792b7e8d3021c9d56ee96df4f48cb823b7941e4]
#    to [aa641b64bcb45bd089254790a8c5e4761f3d34cd]
# 
# patch "packages/linux/linux-hackndev-2.6/palmt650/defconfig"
#  from [d477770893e81e774adbedf9f5551bc7f6476e2f]
#    to [3381801ae55223bc90835b0ee066afe2554e177b]
# 
# patch "packages/linux/linux-hackndev-2.6_svn.bb"
#  from [1b77cf9af0ecbac19c41606d03d140abad2ca6b9]
#    to [148cf43784ebfeb5d4fddc91933aac16db7fb859]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
#  from [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
#    to [0eb7f651217f229fb712ddbf7c70776db3e8d3f3]
# 
# patch "packages/openobex/openobex_1.2.bb"
#  from [5ece940f25b192397d8566c4ff08f3982845d05a]
#    to [6fc26419d5ff49b75a0eff5907ad9148cf66b9a7]
# 
# patch "packages/opie-taskbar/opie-taskbar-images.inc"
#  from [bcc14b15dcb6f610fb2fb93ea7a22680e5dc7c34]
#    to [af9f1520fa611e94512ba6574a480e95de8a16bd]
# 
# patch "packages/opie-taskbar/opie-taskbar-images_cvs.bb"
#  from [364b475cbe870792af3b1c15affcecd9defe9c8e]
#    to [1bba5e8ec05293d5c7cc7bb8b1381f603bec4e86]
# 
# patch "packages/qte/qte-2.3.10/key.patch"
#  from [49f3f1073b110a3bc3c1de9f9aaef0ee3df1e331]
#    to [9f168fab17e5bdaa6ab16c5f06a9ab3aaf4f0cff]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [b5c6d74044d20fbe2710fadff21c3676d6f43b87]
#    to [cc38296766bb33c89f2ab3aeb86d1cbb3d253a82]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [cd42cd7f0ae55e16a0c08e5c2c504eafebdf97a6]
#    to [5b1288691a2d578ba606a8cb911eafb7e25b1c77]
# 
# patch "packages/tasks/task-gpe.bb"
#  from [8a506969d5ce478b90afda1c9305460abb39c51c]
#    to [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
# 
# patch "packages/tasks/task-opie.bb"
#  from [d9b3a961501d5c121f18763d6efbd94634b0ebb4]
#    to [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
# 
============================================================
--- packages/bluez/files/pkgconfig-add-gthread.patch	6c09cd3241b74b602c6af47bd99cbda71e53d7e0
+++ packages/bluez/files/pkgconfig-add-gthread.patch	6c09cd3241b74b602c6af47bd99cbda71e53d7e0
@@ -0,0 +1,50 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2007-07-17 17:25:52.000000000 +0100
++++ git/configure.in	2007-07-17 17:25:52.000000000 +0100
+@@ -75,6 +75,10 @@
+ AC_SUBST(OPENOBEX_CFLAGS)
+ AC_SUBST(OPENOBEX_LIBS)
+ 
++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no)
++AC_SUBST(GTHREAD_CFLAGS)
++AC_SUBST(GTHREAD_LIBS)
++
+ AC_ARG_BLUEZ
+ 
+ AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in)
+Index: git/applet/Makefile.am
+===================================================================
+--- git.orig/applet/Makefile.am	2007-07-17 17:25:52.000000000 +0100
++++ git/applet/Makefile.am	2007-07-17 17:25:52.000000000 +0100
+@@ -4,12 +4,12 @@
+ bluetooth_applet_SOURCES = main.c
+ 
+ bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \
+-	@NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++	@NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+ 
+ nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \
+ 					$(top_builddir)/common/auth-agent-glue.h
+ 
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
+ 
+ INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat
+ 
+Index: git/properties/Makefile.am
+===================================================================
+--- git.orig/properties/Makefile.am	2007-07-17 17:28:11.000000000 +0100
++++ git/properties/Makefile.am	2007-07-17 17:28:44.000000000 +0100
+@@ -4,9 +4,9 @@
+ bluetooth_properties_SOURCES = main.c
+ 
+ bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \
+-			@GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++			@GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+ 
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@
+ 
+ INCLUDES = -I$(top_srcdir)/common
+ 
============================================================
--- packages/brutefir/brutefir_1.0i.bb	e02d07dc7527439ee60d4c2ec25ba9b3d2df741b
+++ packages/brutefir/brutefir_1.0i.bb	e02d07dc7527439ee60d4c2ec25ba9b3d2df741b
@@ -0,0 +1,25 @@
+DESCRIPTION = "BruteFIR is a software convolution engine, a program for applying long FIR filters to multi-channel digital audio, either offline or in realtime."
+LICENSE = "GPLv2"
+
+DEPENDS = "fftw fftwf fftwl"
+
+PR = "r1"
+
+# The unbreak-makefile disables the SSE2, MMX and jack support, feel free 
+# to add back SSE and MMX after fixing the makefile to not use uname to check for cpu 
+
+SRC_URI = "http://www.ludd.luth.se/~torger/files/brutefir-${PV}.tar.gz \
+           file://unbreak-makefile.patch;patch=1 \
+	   "
+
+do_configure() {
+       sed -i -e s:-L/usr/local/lib:-L${STAGING_LIBDIR}:g Makefile
+       sed -i -e s:-I/usr/local/include:-I${STAGING_INCDIR}:g Makefile
+}
+
+do_install() {
+        install -d ${D}${bindir}
+	install -m 755 *.bf* ${D}${bindir}
+	install -m 755 brutefir ${D}${bindir}
+}
+
============================================================
--- packages/brutefir/files/unbreak-makefile.patch	9c157900ebf91a297ad7a7bf8fe5dd7ff5295685
+++ packages/brutefir/files/unbreak-makefile.patch	9c157900ebf91a297ad7a7bf8fe5dd7ff5295685
@@ -0,0 +1,38 @@
+--- /tmp/Makefile	2007-07-19 18:54:47.000000000 +0200
++++ brutefir-1.0i/Makefile	2007-07-19 18:55:44.775215000 +0200
+@@ -36,8 +36,6 @@
+ BRUTEFIR_LIBS	= $(FFTW_LIB) -lm
+ BRUTEFIR_OBJS	= brutefir.o fftw_convolver.o bfconf.o bfrun.o firwindow.o \
+ emalloc.o shmalloc.o dai.o bfconf_lexical.o inout.o dither.o delay.o 
+-BRUTEFIR_IA32_OBJS = convolver_sse2.o convolver_sse.o \
+-convolver_3dnow.o convolver_x87.o
+ 
+ BFIO_FILE_OBJS	= bfio_file.fpic.o
+ 
+@@ -46,8 +44,6 @@
+ 
+ BFIO_OSS_OBJS	= bfio_oss.fpic.o emalloc.fpic.o
+ 
+-BFIO_JACK_LIBS	= -ljack
+-BFIO_JACK_OBJS	= bfio_jack.fpic.o emalloc.fpic.o inout.fpic.o
+ 
+ BFLOGIC_CLI_OBJS = bflogic_cli.fpic.o inout.fpic.o
+ BFLOGIC_EQ_OBJS	= bflogic_eq.fpic.o emalloc.fpic.o shmalloc.fpic.o
+@@ -78,7 +74,6 @@
+ # assume that we have alsa, osss and jack
+ LIB_TARGETS	+= alsa.bfio
+ LIB_TARGETS	+= oss.bfio
+-LIB_TARGETS	+= jack.bfio
+ endif
+ 
+ # Solaris
+@@ -133,9 +128,6 @@
+ oss.bfio: $(BFIO_OSS_OBJS)
+ 	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
+ 
+-jack.bfio: $(BFIO_JACK_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
+-
+ file.bfio: $(BFIO_FILE_OBJS)
+ 	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
+ 
============================================================
--- packages/coreutils/coreutils-5.3.0/futimens.patch	8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
+++ packages/coreutils/coreutils-5.3.0/futimens.patch	8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
@@ -0,0 +1,44 @@
+Index: coreutils-5.3.0/lib/utimens.c
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.c	2005-01-03 22:19:15.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.c	2007-07-01 19:12:32.000000000 +0000
+@@ -55,8 +55,8 @@
+    If TIMESPEC is null, set the time stamps to the current time.  */
+ 
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+-	  char const *file, struct timespec const timespec[2])
++gl_futimens (int fd ATTRIBUTE_UNUSED,
++	     char const *file, struct timespec const timespec[2])
+ {
+   /* There's currently no interface to set file timestamps with
+      nanosecond resolution, so do the best we can, discarding any
+@@ -117,5 +117,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return gl_futimens (-1, file, timespec);
+ }
+Index: coreutils-5.3.0/lib/utimens.h
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.h	2004-11-23 20:54:33.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.h	2007-07-01 19:12:37.000000000 +0000
+@@ -1,3 +1,3 @@
+ #include "timespec.h"
+-int futimens (int, char const *, struct timespec const [2]);
++int gl_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+Index: coreutils-5.3.0/src/touch.c
+===================================================================
+--- coreutils-5.3.0.orig/src/touch.c	2004-11-23 20:54:35.000000000 +0000
++++ coreutils-5.3.0/src/touch.c	2007-07-01 19:11:52.000000000 +0000
+@@ -191,7 +191,7 @@
+       t = timespec;
+     }
+ 
+-  ok = (futimens (fd, file, t) == 0);
++  ok = (gl_futimens (fd, file, t) == 0);
+   if (fd != -1)
+     ok &= (close (fd) == 0);
+ 
============================================================
--- packages/fftw/benchfft_3.1.bb	217cacf7b83c2dc1f5305f68779e0bb8dd9a44d8
+++ packages/fftw/benchfft_3.1.bb	217cacf7b83c2dc1f5305f68779e0bb8dd9a44d8
@@ -0,0 +1,15 @@
+DESCRIPTION = "FFTW benchmarks"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://www.fftw%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -re520909be2622e4bbdf3326729ffc870686d568e -r15a71bc10dfda511628c2bd03cad08430b3f8cb0
#
# 
# 
# rename "packages/efl1/edje-native_0.5.0.038.bb"
#     to "packages/efl1/edje-native_0.5.0.040.bb"
# 
# rename "packages/efl1/edje_0.5.0.038.bb"
#     to "packages/efl1/edje_0.5.0.040.bb"
# 
# rename "packages/efl1/eet-native_0.9.10.038.bb"
#     to "packages/efl1/eet-native_0.9.10.040.bb"
# 
# rename "packages/efl1/eet_0.9.10.038.bb"
#     to "packages/efl1/eet_0.9.10.040.bb"
# 
# rename "packages/efl1/efreet_0.0.3.002.bb"
#     to "packages/efl1/efreet_0.0.3.005.bb"
# 
# rename "packages/efl1/embryo-native_0.9.1.038.bb"
#     to "packages/efl1/embryo-native_0.9.1.040.bb"
# 
# rename "packages/efl1/embryo_0.9.1.038.bb"
#     to "packages/efl1/embryo_0.9.1.040.bb"
# 
# rename "packages/efl1/emotion_0.0.1.006.bb"
#     to "packages/efl1/emotion_0.0.1.007.bb"
# 
# rename "packages/efl1/epeg_0.9.0.009.bb"
#     to "packages/efl1/epeg_0.9.0.010.bb"
# 
# rename "packages/efl1/epsilon_0.3.0.009.bb"
#     to "packages/efl1/epsilon_0.3.0.010.bb"
# 
# rename "packages/efl1/esmart_0.9.0.009.bb"
#     to "packages/efl1/esmart_0.9.0.010.bb"
# 
# rename "packages/efl1/evas-native_0.9.9.038.bb"
#     to "packages/efl1/evas-native_0.9.9.040.bb"
# 
# rename "packages/efl1/evas_0.9.9.038.bb"
#     to "packages/efl1/evas_0.9.9.040.bb"
# 
# rename "packages/efl1/ewl_0.5.1.009.bb"
#     to "packages/efl1/ewl_0.5.1.010.bb"
# 
# rename "packages/efl1/imlib2_1.4.0.001.bb"
#     to "packages/efl1/imlib2_1.4.0.002.bb"
# 
# patch "classes/efl1.bbclass"
#  from [05253e5fc23910b56de2c50c38a1e2e0b154f242]
#    to [c5d4fa39e37e786b0011996a8c2f9c2818c4f2bc]
# 
# patch "packages/efl1/eet_0.9.10.040.bb"
#  from [57ecdea84d245936f9cde5253c4877f45b99976e]
#    to [9b5c783cd0eefe0adc9947dbf646f04a024f460c]
# 
# patch "packages/efl1/emotion_0.0.1.007.bb"
#  from [e968107e2e2b7742689cdb7e268c34018e252ffa]
#    to [fedd137c32fd4fdab54c1011a673afce37039483]
# 
# patch "packages/efl1/evas.inc"
#  from [6017e94718de8094aa8b5883c55927c7c943c226]
#    to [8cf61bd0660a5b5710e0547d0bed9fd06e0c0b25]
# 
# patch "packages/efl1/evas_0.9.9.040.bb"
#  from [7eaec22e49034f8359743fd48383d6b2274731b7]
#    to [4fcd71f0e352f97f6e84c02bd4aef385c1042b8a]
# 
# patch "packages/efl1/ewl_0.5.1.010.bb"
#  from [0bd38ec9b5462014c2bc7f61ce423f70373bbe32]
#    to [afa672ceeb3faa99b64d4897e214dbbff358a5fa]
# 
# patch "packages/efl1/imlib2_1.4.0.002.bb"
#  from [a234478e69ae1e65eaa10c5042cedf110b7721c5]
#    to [edfcc8589430da26392ebd4318c0fa48be9ffdae]
# 
============================================================
--- classes/efl1.bbclass	05253e5fc23910b56de2c50c38a1e2e0b154f242
+++ classes/efl1.bbclass	c5d4fa39e37e786b0011996a8c2f9c2818c4f2bc
@@ -8,7 +8,7 @@ SRCNAME = "${@bb.data.getVar('PN', d, 1)
 SECTION = "e/libs"
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${SRCNAME}-${PV}.tar.gz"
+SRC_URI = "http://download.enlightenment.org/snapshots/2007-07-10/${SRCNAME}-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 libdirectory = "src/lib"
============================================================
--- packages/efl1/eet_0.9.10.038.bb	57ecdea84d245936f9cde5253c4877f45b99976e
+++ packages/efl1/eet_0.9.10.040.bb	9b5c783cd0eefe0adc9947dbf646f04a024f460c
@@ -7,5 +7,3 @@ inherit efl1
 PR = "r0"
 
 inherit efl1
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-05-06/eet-${PV}.tar.gz"
============================================================
--- packages/efl1/emotion_0.0.1.006.bb	e968107e2e2b7742689cdb7e268c34018e252ffa
+++ packages/efl1/emotion_0.0.1.007.bb	fedd137c32fd4fdab54c1011a673afce37039483
@@ -7,8 +7,6 @@ inherit efl1
 
 inherit efl1
 
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/emotion-${PV}.tar.gz"
-
 EXTRA_OECONF = "--disable-xine --enable-gstreamer"
 
 PACKAGES =+ "emotion-backend-gstreamer emotion-test"
============================================================
--- packages/efl1/evas.inc	6017e94718de8094aa8b5883c55927c7c943c226
+++ packages/efl1/evas.inc	8cf61bd0660a5b5710e0547d0bed9fd06e0c0b25
@@ -10,23 +10,13 @@ export FREETYPE_CONFIG = "${STAGING_BIND
 
 export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
-SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           ${E_CVS};module=e17/libs/evas/m4;date=20060101"
+SRC_URI += "file://fix-configure.patch;patch=1"
 
 S = "${WORKDIR}/evas-${PV}"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
 
 EXTRA_OECONF = "<override me>"
 
-do_configure_prepend() {
-    if [ -e "${WORKDIR}/m4" ]; then
-        install -d "${S}/m4"
-        install "${WORKDIR}/m4/"*.m4 "${S}/m4"
-        aclocal -I m4
-    fi
-}
-
 python populate_packages_prepend () {
         for plugin_type in "engines loaders savers".split():
             bb.note( "splitting packages for evas %s..." % plugin_type )
@@ -42,16 +32,6 @@ do_install_append() {
     find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
 }
 
-#do_stage_append() {
-#	cd src
-#	modules=`find modules -name ".libs"`
-#	for module in $modules
-#	do
-#		install -d ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}
-#		install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/${TARGET_OS}-gnu-${TARGET_ARCH}/module.so
-#	done
-#}
-
 FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
 FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
============================================================
--- packages/efl1/evas_0.9.9.038.bb	7eaec22e49034f8359743fd48383d6b2274731b7
+++ packages/efl1/evas_0.9.9.040.bb	4fcd71f0e352f97f6e84c02bd4aef385c1042b8a
@@ -10,7 +10,7 @@ EXTRA_OECONF = "\
 		--disable-software-ddraw	\
 		--disable-software-qtopia	\
 		--enable-software-x11		\
-		--enable-software-16-x11	\
+		--disable-software-16-x11	\
 		--disable-software-xcb		\
 		--disable-gl-x11			\
 		--enable-xrender-x11		\
============================================================
--- packages/efl1/ewl_0.5.1.009.bb	0bd38ec9b5462014c2bc7f61ce423f70373bbe32
+++ packages/efl1/ewl_0.5.1.010.bb	afa672ceeb3faa99b64d4897e214dbbff358a5fa
@@ -7,5 +7,3 @@ inherit efl1
 PR = "r0"
 
 inherit efl1
-
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/ewl-${PV}.tar.gz"
============================================================
--- packages/efl1/imlib2_1.4.0.001.bb	a234478e69ae1e65eaa10c5042cedf110b7721c5
+++ packages/efl1/imlib2_1.4.0.002.bb	edfcc8589430da26392ebd4318c0fa48be9ffdae
@@ -1,12 +1,11 @@ DEPENDS = "freetype libpng jpeg"
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg"
+PR = "r0"
 
 inherit efl1
 
-PR = "r1"
-
 PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters"
 FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
 FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/"






More information about the Openembedded-commits mailing list