diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/jaaa | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/jaaa')
| -rw-r--r-- | recipes/jaaa/clalsadrv_1.2.2.bb | 2 | ||||
| -rw-r--r-- | recipes/jaaa/clthreads_2.4.0.bb | 2 | ||||
| -rw-r--r-- | recipes/jaaa/clxclient_3.6.1.bb | 2 | ||||
| -rw-r--r-- | recipes/jaaa/jaaa_0.4.2.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes/jaaa/clalsadrv_1.2.2.bb b/recipes/jaaa/clalsadrv_1.2.2.bb index 48ba67ff84..5174dcac02 100644 --- a/recipes/jaaa/clalsadrv_1.2.2.bb +++ b/recipes/jaaa/clalsadrv_1.2.2.bb @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "alsa-lib" SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clalsadrv-${PV}.tar.bz2 \ - file://clalsadrv-Makefile.patch;patch=1 \ + file://clalsadrv-Makefile.patch \ " S = "${WORKDIR}/clalsadrv" diff --git a/recipes/jaaa/clthreads_2.4.0.bb b/recipes/jaaa/clthreads_2.4.0.bb index 16da50f399..4f7d244637 100644 --- a/recipes/jaaa/clthreads_2.4.0.bb +++ b/recipes/jaaa/clthreads_2.4.0.bb @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "" SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clthreads-${PV}.tar.bz2 \ - file://clthreads-Makefile.patch;patch=1 \ + file://clthreads-Makefile.patch \ " S = "${WORKDIR}/clthreads-${PV}" diff --git a/recipes/jaaa/clxclient_3.6.1.bb b/recipes/jaaa/clxclient_3.6.1.bb index 7d3deea557..9f2ed50b76 100644 --- a/recipes/jaaa/clxclient_3.6.1.bb +++ b/recipes/jaaa/clxclient_3.6.1.bb @@ -8,7 +8,7 @@ DEPENDS = "libx11 clthreads freetype libxft" RDEPENDS = "libx11-locale" SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/clxclient-${PV}.tar.bz2 \ - file://clxclient-Makefile.patch;patch=1 \ + file://clxclient-Makefile.patch \ " S = "${WORKDIR}/clxclient-${PV}" diff --git a/recipes/jaaa/jaaa_0.4.2.bb b/recipes/jaaa/jaaa_0.4.2.bb index 61ed764ca4..b729813582 100644 --- a/recipes/jaaa/jaaa_0.4.2.bb +++ b/recipes/jaaa/jaaa_0.4.2.bb @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "clthreads clxclient clalsadrv jack freetype fftwf" SRC_URI = "http://www.kokkinizita.net/linuxaudio/downloads/jaaa-${PV}.tar.bz2 \ - file://jaaa-Makefile.patch;patch=1 \ + file://jaaa-Makefile.patch \ " S = "${WORKDIR}/jaaa" |