diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-11 02:17:19 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-11 02:17:19 +0400 |
| commit | 6cf180ff0c54193cf2dca1a222574c3501b9dad6 (patch) | |
| tree | 3698a063d07616e11335a05b341b7ccb9cdb5d36 /recipes | |
| parent | 0628081b0377b36a7db9e74e5a27a079978f2924 (diff) | |
| parent | 9b978539d86aaaf1189df2f740a33549946afe10 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
68 files changed, 15371 insertions, 77 deletions
diff --git a/recipes/angstrom/angstrom-gpe-task-base.bb b/recipes/angstrom/angstrom-gpe-task-base.bb index 4540fddee6..87da07c4f3 100644 --- a/recipes/angstrom/angstrom-gpe-task-base.bb +++ b/recipes/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r38" +PR = "r39" inherit task @@ -10,13 +10,11 @@ RDEPENDS_${PN} = "\ matchbox \ matchbox-panel-hacks \ matchbox-applet-startup-monitor \ - xcursor-transparent-theme \ rxvt-unicode \ gpe-terminal \ matchbox-keyboard \ xkbd \ xkbd-layout-ru \ - gpe-theme-clearlooks \ xst \ xhost \ xrdb \ @@ -39,3 +37,7 @@ RDEPENDS_${PN} = "\ ${@base_contains("COMBINED_FEATURES", "bluetooth", "gnome-bluetooth", "",d)} \ " +RRECOMMENDS_${PN} = " \ + gpe-theme-clearlooks \ + xcursor-transparent-theme \ +" diff --git a/recipes/dbus/dbus-glib-0.78/no-examples.patch b/recipes/dbus/dbus-glib-0.78/no-examples.patch new file mode 100644 index 0000000000..483153db74 --- /dev/null +++ b/recipes/dbus/dbus-glib-0.78/no-examples.patch @@ -0,0 +1,8 @@ +--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 ++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = . examples ++SUBDIRS = . + + INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" + diff --git a/recipes/dbus/dbus-glib-0.78/no-introspect.patch b/recipes/dbus/dbus-glib-0.78/no-introspect.patch new file mode 100644 index 0000000000..9115801f71 --- /dev/null +++ b/recipes/dbus/dbus-glib-0.78/no-introspect.patch @@ -0,0 +1,14 @@ +Index: dbus-glib-0.73/tools/Makefile.am +=================================================================== +--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200 ++++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200 +@@ -3,9 +3,6 @@ + nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h + libdbus_glibdir = $(includedir)/dbus-1.0/dbus + +-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) +- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml +- + BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml + + if USE_INTROSPECT_XML diff --git a/recipes/dbus/dbus-glib_0.78.bb b/recipes/dbus/dbus-glib_0.78.bb new file mode 100644 index 0000000000..398314bdff --- /dev/null +++ b/recipes/dbus/dbus-glib_0.78.bb @@ -0,0 +1,22 @@ +SECTION = "base" +HOMEPAGE = "http://www.freedesktop.org/Software/dbus" +DESCRIPTION = "message bus system for applications to talk to one another" +LICENSE = "GPL" +DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ + file://no-examples.patch;patch=1 \ + file://no-introspect.patch;patch=1" + +inherit autotools_stage gettext +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} = "${libdir}/lib*.so.* ${libexecdir}/dbus* ${sysconfdir}/profile.d" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" + +do_configure_prepend() { + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ + install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ +} + +FILES_${PN}-dev += "${bindir}/dbus-binding-tool" diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb index 9b0919ef82..b335c7b707 100644 --- a/recipes/dsplink/ti-dmai_svn.bb +++ b/recipes/dsplink/ti-dmai_svn.bb @@ -15,7 +15,7 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_022309;proto file://unloadmodules-ti-dmai-apps.sh \ " -SRCREV = "36" +SRCREV = "120" S = "${WORKDIR}/BRIJESH_GIT_022309/davinci_multimedia_application_interface/dmai" # Yes, the xdc stuff still breaks with a '.' in PWD diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 716b96e883..b9f01ba8b3 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r4" +PR = "r5" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index d2a773805d..9561cfedc6 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -20,7 +20,7 @@ python populate_packages_prepend () { basedir = bb.data.expand( '${libdir}/evas/modules/%s' % plugin_type, d ) do_split_packages(d, basedir, '^(.*)', - output_pattern = 'evas-' + plugin_type[:-1] + "-%s", + output_pattern = 'libevas-' + plugin_type[:-1] + "-%s", description = 'Evas module %s', allow_dirs=True, recursive=False, extra_depends="" ) } diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb index 02d4cf446a..f84bd48f7a 100644 --- a/recipes/efl1/evas_svn.bb +++ b/recipes/efl1/evas_svn.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r1" +PR = "r3" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/recipes/farsight/farsight2_0.0.9.bb b/recipes/farsight/farsight2_0.0.9.bb new file mode 100644 index 0000000000..19e081c33a --- /dev/null +++ b/recipes/farsight/farsight2_0.0.9.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers." +HOMEPAGE = "http://farsight.sf.net" +SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz" + +DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = " \ + --disable-debug \ + --disable-gtk-doc \ + --disable-python \ +" + +FILES_${PN} += "${libdir}/*/*.so" +FILES_${PN}-dev += "${libdir}/*/*a" +FILES_${PN}-dbg += "${libdir}/*/.debug" + + + + diff --git a/recipes/farsight/libnice_0.0.6.bb b/recipes/farsight/libnice_0.0.6.bb new file mode 100644 index 0000000000..fa478dc0e3 --- /dev/null +++ b/recipes/farsight/libnice_0.0.6.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)." +HOMEPAGE = "http://nice.freedesktop.org/wiki/" +SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" + +LICENSE = "LGPL/MPL" +DEPENDS = "glib-2.0 gstreamer" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a" +FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" + +do_compile_append() { + for i in $(find ${S} -name "*.pc") ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done +} + + diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc index 461315649b..4dad51e4db 100644 --- a/recipes/gnome/libart-lgpl.inc +++ b/recipes/gnome/libart-lgpl.inc @@ -4,6 +4,8 @@ LICENSE = "LGPL" ART_CONFIG = "${HOST_ARCH}/art_config.h" +INC_PR = "r4" + # can't use gnome.oeclass due to _ in filename SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ file://${ART_CONFIG} \ @@ -27,7 +29,6 @@ EXTRA_OECONF = "--disable-gtk-doc" # enforced. export MKDIR_P = "mkdir -p" export mkdir_p = "mkdir -p" -export INSTALL = "${STAGING_BINDIR_NATIVE}/install-sh" do_stage() { autotools_stage_includes diff --git a/recipes/gnome/libart-lgpl_2.3.16.bb b/recipes/gnome/libart-lgpl_2.3.16.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.16.bb +++ b/recipes/gnome/libart-lgpl_2.3.16.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gnome/libart-lgpl_2.3.19.bb b/recipes/gnome/libart-lgpl_2.3.19.bb index 3605a384cd..99f8f8b280 100644 --- a/recipes/gnome/libart-lgpl_2.3.19.bb +++ b/recipes/gnome/libart-lgpl_2.3.19.bb @@ -1,3 +1,4 @@ require libart-lgpl.inc -PR = "r2" +PR = "${INC_PR}.1" + diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc index d406b504ad..88462404d1 100644 --- a/recipes/gnuradio/gnuradio.inc +++ b/recipes/gnuradio/gnuradio.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" -inherit distutils-base autotools pkgconfig +inherit distutils-base autotools autotools_stage pkgconfig export BUILD_SYS export HOST_SYS=${MULTIMACH_TARGET_SYS} diff --git a/recipes/gpe-announce/files/fix-install.diff b/recipes/gpe-announce/files/fix-install.diff new file mode 100644 index 0000000000..3827f5562a --- /dev/null +++ b/recipes/gpe-announce/files/fix-install.diff @@ -0,0 +1,13 @@ +diff --git gpe-announce-0.13/Makefile-orig gpe-announce-0.13/Makefile +index 56e016a..f8bade4 100644 +--- gpe-announce-0.13/Makefile-orig ++++ gpe-announce-0.13/Makefile +@@ -47,7 +47,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + + clean: + rm -f $(PACKAGE) $(OBJS) $(DEPS) diff --git a/recipes/gpe-announce/gpe-announce_0.13.bb b/recipes/gpe-announce/gpe-announce_0.13.bb index 6ffe317a12..21538c43a7 100644 --- a/recipes/gpe-announce/gpe-announce_0.13.bb +++ b/recipes/gpe-announce/gpe-announce_0.13.bb @@ -4,4 +4,7 @@ DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" LICENSE = "GPL" PR = "r1" -SRC_URI += "file://fix-esound.diff;patch=1" +SRC_URI += " \ + file://fix-esound.diff;patch=1 \ + file://fix-install.diff;patch=1 \ + " diff --git a/recipes/gpe-announce/gpe-announce_0.14.bb b/recipes/gpe-announce/gpe-announce_0.14.bb new file mode 100644 index 0000000000..9fb7e95daf --- /dev/null +++ b/recipes/gpe-announce/gpe-announce_0.14.bb @@ -0,0 +1,7 @@ +inherit gpe + +DEPENDS = "libsoundgen libschedule gtk+ libgpewidget" +LICENSE = "GPL" +PR = "r0" + +SRC_URI += "file://fix-esound.diff;patch=1" diff --git a/recipes/gpe-clock/files/fix-install.patch b/recipes/gpe-clock/files/fix-install.patch new file mode 100644 index 0000000000..2d3e3032d0 --- /dev/null +++ b/recipes/gpe-clock/files/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-clock-0.25/Makefile-orig gpe-clock-0.25/Makefile +index 4fa59bf..e716fcb 100644 +--- gpe-clock-0.25/Makefile-orig ++++ gpe-clock-0.25/Makefile +@@ -36,7 +36,7 @@ $(PACKAGE): $(OBJS) + + install-program: all + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -d $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ + install -d $(DESTDIR)$(PREFIX)/share/applications diff --git a/recipes/gpe-clock/gpe-clock_0.21.bb b/recipes/gpe-clock/gpe-clock_0.21.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.21.bb +++ b/recipes/gpe-clock/gpe-clock_0.21.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.23.bb b/recipes/gpe-clock/gpe-clock_0.23.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.23.bb +++ b/recipes/gpe-clock/gpe-clock_0.23.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.24.bb b/recipes/gpe-clock/gpe-clock_0.24.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.24.bb +++ b/recipes/gpe-clock/gpe-clock_0.24.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.25.bb b/recipes/gpe-clock/gpe-clock_0.25.bb index de509fda40..6811461085 100644 --- a/recipes/gpe-clock/gpe-clock_0.25.bb +++ b/recipes/gpe-clock/gpe-clock_0.25.bb @@ -1 +1,3 @@ require gpe-clock.inc + +SRC_URI += "file://fix-install.patch;patch=1" diff --git a/recipes/gpe-clock/gpe-clock_0.27.bb b/recipes/gpe-clock/gpe-clock_0.27.bb new file mode 100644 index 0000000000..de509fda40 --- /dev/null +++ b/recipes/gpe-clock/gpe-clock_0.27.bb @@ -0,0 +1 @@ +require gpe-clock.inc diff --git a/recipes/gpe-mixer/gpe-mixer/fix-install.patch b/recipes/gpe-mixer/gpe-mixer/fix-install.patch new file mode 100644 index 0000000000..ec5ea2cd0e --- /dev/null +++ b/recipes/gpe-mixer/gpe-mixer/fix-install.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2009-05-09 21:11:12.000000000 +0200 ++++ Makefile 2009-05-09 21:11:39.000000000 +0200 +@@ -36,7 +36,7 @@ + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-mixer/gpe-mixer_0.42.bb b/recipes/gpe-mixer/gpe-mixer_0.42.bb index 5fe0e98c82..c2f7bbe098 100644 --- a/recipes/gpe-mixer/gpe-mixer_0.42.bb +++ b/recipes/gpe-mixer/gpe-mixer_0.42.bb @@ -3,7 +3,8 @@ PR = "r1" inherit gpe pkgconfig -SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1" +SRC_URI += "file://gpemixer-no-host-includes.patch;patch=1 \ + file://fix-install.patch;patch=1" DESCRIPTION = "GPE audio mixer" DEPENDS = "gtk+ libgpewidget" diff --git a/recipes/gpe-plucker/gpe-plucker/fix-install.patch b/recipes/gpe-plucker/gpe-plucker/fix-install.patch new file mode 100644 index 0000000000..cfd5bc477a --- /dev/null +++ b/recipes/gpe-plucker/gpe-plucker/fix-install.patch @@ -0,0 +1,13 @@ +diff --git gpe-plucker-0.4/Makefile-orig gpe-plucker-0.4/Makefile +index c68b5ab..abf97bb 100644 +--- gpe-plucker-0.4/Makefile-orig ++++ gpe-plucker-0.4/Makefile +@@ -43,7 +43,7 @@ $(PACKAGE): $(OBJS) $(LIB) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps + install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png + #mkdir -p $(DESTDIR)$(PREFIX)/share/$(PACKAGE) diff --git a/recipes/gpe-plucker/gpe-plucker_0.4.bb b/recipes/gpe-plucker/gpe-plucker_0.4.bb index 8e90d2f06b..4a2937a83b 100644 --- a/recipes/gpe-plucker/gpe-plucker_0.4.bb +++ b/recipes/gpe-plucker/gpe-plucker_0.4.bb @@ -5,10 +5,13 @@ DEPENDS = "gtk+ libgpewidget gpe-icons" RDEPENDS = "gpe-icons" SECTION = "gpe" PRIORITY = "optional" +PR = "r3" + +SRC_URI += " \ + file://plucker-no-host-includes.patch;patch=1 \ + file://fix-install.patch;patch=1 \ + " -SRC_URI += " file://plucker-no-host-includes.patch;patch=1" PARALLEL_MAKE="" EXTRA_OEMAKE="RANLIB=${RANLIB}" -PR = "r2" - diff --git a/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch b/recipes/gpe-tetris/gpe-tetris-0.6-4/fix-install.patch new file mode 100644 index 0000000000..2e32aa5ee9 |
