diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-08-25 11:20:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-02 18:15:29 +0100 |
commit | 99666e772dd50767295294a5686710e6e2a49851 (patch) | |
tree | 94af09055008a86accc352dc4fd65c82ad15c5f3 /meta/recipes-sato | |
parent | 06a89cb47da39fb9bb29e23cfb1751258391aeb2 (diff) | |
download | poky-99666e772dd50767295294a5686710e6e2a49851.tar.gz |
o-hand recipes: convert from svn.o-hand.org to git.yoctoproject.org
(From OE-Core rev: 4e7218c19775ef81caed27742e9d203af10b7416)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/gaku/gaku_git.bb (renamed from meta/recipes-sato/gaku/gaku_svn.bb) | 11 | ||||
-rw-r--r-- | meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb (renamed from meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb) | 12 | ||||
-rw-r--r-- | meta/recipes-sato/libowl/libowl_git.bb (renamed from meta/recipes-sato/libowl/libowl_svn.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb (renamed from meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb | 12 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb | 12 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb (renamed from meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-sato/owl-video-widget/libowl-av_git.bb (renamed from meta/recipes-sato/owl-video-widget/libowl-av_svn.bb) | 11 | ||||
-rw-r--r-- | meta/recipes-sato/owl-video-widget/owl-video_git.bb (renamed from meta/recipes-sato/owl-video-widget/owl-video_svn.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-sato/puzzles/oh-puzzles_git.bb (renamed from meta/recipes-sato/puzzles/oh-puzzles_svn.bb) | 14 | ||||
-rw-r--r-- | meta/recipes-sato/screenshot/screenshot_git.bb (renamed from meta/recipes-sato/screenshot/screenshot_svn.bb) | 10 | ||||
-rw-r--r-- | meta/recipes-sato/web/web-webkit_git.bb (renamed from meta/recipes-sato/web/web-webkit_svn.bb) | 10 |
12 files changed, 66 insertions, 64 deletions
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_git.bb index 3806021b0d..9f1bad205b 100644 --- a/meta/recipes-sato/gaku/gaku_svn.bb +++ b/meta/recipes-sato/gaku/gaku_git.bb | |||
@@ -15,13 +15,12 @@ RRECOMMENDS_${PN} = "gst-plugins-good-id3demux \ | |||
15 | gst-plugins-base-ogg \ | 15 | gst-plugins-base-ogg \ |
16 | ${COMMERCIAL_AUDIO_PLUGINS}" | 16 | ${COMMERCIAL_AUDIO_PLUGINS}" |
17 | 17 | ||
18 | SRCREV = "399" | 18 | SRCREV = "a0be2fe4b5f12b8b07f4e3bd624b3729657f0ac5" |
19 | PV = "0.0+svnr${SRCPV}" | 19 | PV = "0.1+git${SRCPV}" |
20 | PR = "r0" | ||
20 | 21 | ||
21 | PR = "r4" | 22 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
22 | 23 | ||
23 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http" | 24 | S = "${WORKDIR}/git" |
24 | |||
25 | S = "${WORKDIR}/${BPN}" | ||
26 | 25 | ||
27 | inherit autotools pkgconfig | 26 | inherit autotools pkgconfig |
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb index 6099ae4067..224b6e1327 100644 --- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_svn.bb +++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb | |||
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ | |||
4 | file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \ | 4 | file://src/sato-utils.h;endline=24;md5=708f28cfe7fe028d497aaf4389b80b62 \ |
5 | file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a" | 5 | file://src/sato-main.c;endline=24;md5=b5e5dddebca570275becb51b526e4c5a" |
6 | 6 | ||
7 | SRCREV = "163" | 7 | SRCREV = "e4a29fbb7648f12fb3aefd8ea0120c3f54ba392a" |
8 | PV = "0.3.2+svnr${SRCPV}" | 8 | PV = "0.3.3+git${SRCPV}" |
9 | PR = "r1" | 9 | PR = "r0" |
10 | 10 | ||
11 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http" | 11 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
12 | 12 | ||
13 | EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" | 13 | S = "${WORKDIR}/git" |
14 | 14 | ||
15 | S = "${WORKDIR}/gtk-engine" | 15 | EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" |
diff --git a/meta/recipes-sato/libowl/libowl_svn.bb b/meta/recipes-sato/libowl/libowl_git.bb index 1500fad5c6..20bc0599d0 100644 --- a/meta/recipes-sato/libowl/libowl_svn.bb +++ b/meta/recipes-sato/libowl/libowl_git.bb | |||
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
10 | 10 | ||
11 | SECTION = "libs" | 11 | SECTION = "libs" |
12 | DEPENDS = "gtk+" | 12 | DEPENDS = "gtk+" |
13 | SRCREV = "408" | 13 | SRCREV = "6ebc8ac8f8575278dd40a535cadefa26374e44b1" |
14 | PV = "0.0+svnr${SRCPV}" | 14 | PV = "0.1+git${SRCPV}" |
15 | PR = "r6" | 15 | PR = "r0" |
16 | 16 | ||
17 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http" | 17 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
18 | 18 | ||
19 | S = "${WORKDIR}/${BPN}" | 19 | S = "${WORKDIR}/git" |
20 | 20 | ||
21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
diff --git a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb index 7a68138fc7..5daeb72762 100644 --- a/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb +++ b/meta/recipes-sato/matchbox-desktop-sato/matchbox-desktop-sato_git.bb | |||
@@ -8,12 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | |||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | DEPENDS = "" | 9 | DEPENDS = "" |
10 | CONFLICTS = "matchbox-common" | 10 | CONFLICTS = "matchbox-common" |
11 | SRCREV = "76" | 11 | |
12 | PV = "0.0+svnr${SRCPV}" | 12 | SRCREV = "810b0b08eb79e4685202da2ec347b990bb467e07" |
13 | PV = "0.1+git${SRCPV}" | ||
13 | PR = "r0" | 14 | PR = "r0" |
14 | 15 | ||
15 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http" | 16 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
16 | S = "${WORKDIR}/desktop-folders" | 17 | |
18 | S = "${WORKDIR}/git" | ||
17 | 19 | ||
18 | inherit autotools pkgconfig | 20 | inherit autotools pkgconfig |
19 | 21 | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb new file mode 100644 index 0000000000..d6bfb2f8fb --- /dev/null +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_git.bb | |||
@@ -0,0 +1,12 @@ | |||
1 | require matchbox-theme-sato.inc | ||
2 | |||
3 | DEPENDS = "matchbox-wm-2" | ||
4 | SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" | ||
5 | PV = "0.2+git${SRCPV}" | ||
6 | |||
7 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git \ | ||
8 | file://png_rename.patch" | ||
9 | |||
10 | S = "${WORKDIR}/git" | ||
11 | |||
12 | EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2" | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb deleted file mode 100644 index 89e01b148b..0000000000 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato-2_svn.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require matchbox-theme-sato.inc | ||
2 | |||
3 | DEPENDS = "matchbox-wm-2" | ||
4 | SRCREV = "164" | ||
5 | PV = "0.1+svnr${SRCPV}" | ||
6 | |||
7 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http \ | ||
8 | file://png_rename.patch" | ||
9 | |||
10 | S = "${WORKDIR}/matchbox-sato" | ||
11 | |||
12 | EXTRA_OECONF = "--disable-matchbox-1 --enable-matchbox-2" | ||
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb index 776d802c4e..bb41fdfea3 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_svn.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb | |||
@@ -1,13 +1,13 @@ | |||
1 | require matchbox-theme-sato.inc | 1 | require matchbox-theme-sato.inc |
2 | 2 | ||
3 | SRCREV = "90" | 3 | SRCREV = "f72cf4ed7d71ad9e47b0f2d3dbc593bc2f3e76f8" |
4 | PV = "0.1+svnr${SRCPV}" | 4 | PV = "0.2+git${SRCPV}" |
5 | PR = "r0" | 5 | PR = "r0" |
6 | 6 | ||
7 | DEFAULT_PREFERENCE = "-1" | 7 | DEFAULT_PREFERENCE = "-1" |
8 | 8 | ||
9 | SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=matchbox-sato;proto=http" | 9 | SRC_URI = "git://git.yoctoproject.org/matchbox-sato;protocol=git" |
10 | 10 | ||
11 | EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" | 11 | EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" |
12 | 12 | ||
13 | S = "${WORKDIR}/matchbox-sato" | 13 | S = "${WORKDIR}/git" |
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb index 04928a4c30..176b61ffc5 100644 --- a/meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb | |||
@@ -12,14 +12,15 @@ DEPENDS = "gtk+ gstreamer gst-plugins-base" | |||
12 | RDEPENDS_${PN} = "gst-meta-base" | 12 | RDEPENDS_${PN} = "gst-meta-base" |
13 | RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" | 13 | RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video" |
14 | 14 | ||
15 | SRCREV = "416" | 15 | SRCREV = "1379fd230a32509e94971961183f1031f469737a" |
16 | PV = "0.0+svnr${SRCPV}" | 16 | PV = "0.1+git${SRCPV}" |
17 | PR = "r6" | 17 | PR = "r0" |
18 | 18 | ||
19 | S = "${WORKDIR}/${BPN}" | ||
20 | 19 | ||
21 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \ | 20 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
22 | file://gst_change_state.patch \ | 21 | file://gst_change_state.patch \ |
23 | file://make-382.patch" | 22 | file://make-382.patch" |
24 | 23 | ||
24 | S = "${WORKDIR}/git" | ||
25 | |||
25 | inherit autotools pkgconfig | 26 | inherit autotools pkgconfig |
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb b/meta/recipes-sato/owl-video-widget/owl-video_git.bb index 52883ce2c3..3ecb82e78b 100644 --- a/meta/recipes-sato/owl-video-widget/owl-video_svn.bb +++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb | |||
@@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \ | |||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | DEPENDS = "libowl-av" | 9 | DEPENDS = "libowl-av" |
10 | 10 | ||
11 | SRCREV = "394" | 11 | SRCREV = "f133472318970796fae1ea3e98ac062156768baf" |
12 | PV = "0.0+svnr${SRCPV}" | 12 | PV = "0.1+git${SRCPV}" |
13 | PR = "r3" | 13 | PR = "r0" |
14 | 14 | ||
15 | S = "${WORKDIR}/video" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
17 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \ | 17 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
18 | file://gtk_multithread_safe.patch \ | 18 | file://gtk_multithread_safe.patch \ |
19 | file://owl-video-widget.png \ | 19 | file://owl-video-widget.png \ |
20 | file://stock_media-play.png \ | 20 | file://stock_media-play.png \ |
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb index b5e5b91b65..6d95d79e8c 100644 --- a/meta/recipes-sato/puzzles/oh-puzzles_svn.bb +++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb | |||
@@ -11,18 +11,18 @@ SECTION = "x11" | |||
11 | DEPENDS = "gtk+ gconf intltool-native librsvg" | 11 | DEPENDS = "gtk+ gconf intltool-native librsvg" |
12 | DEPENDS_append_poky = " libowl" | 12 | DEPENDS_append_poky = " libowl" |
13 | 13 | ||
14 | SRCREV = "23" | 14 | SRCREV = "92f1a20e4b72eed7a35b00984d9793b51dc2fb3b" |
15 | PV = "0.1+svnr${SRCPV}" | 15 | PV = "0.2+git${SRCPV}" |
16 | PR = "r10" | 16 | PR = "r10" |
17 | 17 | ||
18 | bindir = "/usr/games" | 18 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git" |
19 | SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " | ||
19 | 20 | ||
20 | inherit autotools pkgconfig | 21 | S = "${WORKDIR}/git" |
21 | 22 | ||
22 | SRC_URI = "svn://svn.o-hand.com/repos/;module=oh-puzzles;proto=http" | 23 | inherit autotools pkgconfig |
23 | SRC_URI_append_poky = " file://oh-puzzles-owl-menu.patch;striplevel=0 " | ||
24 | 24 | ||
25 | S = "${WORKDIR}/${BPN}" | 25 | bindir = "/usr/games" |
26 | 26 | ||
27 | EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" | 27 | EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" |
28 | 28 | ||
diff --git a/meta/recipes-sato/screenshot/screenshot_svn.bb b/meta/recipes-sato/screenshot/screenshot_git.bb index 825870d6dd..917a27dc22 100644 --- a/meta/recipes-sato/screenshot/screenshot_svn.bb +++ b/meta/recipes-sato/screenshot/screenshot_git.bb | |||
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" | 8 | file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" |
9 | 9 | ||
10 | DEPENDS = "matchbox-panel-2" | 10 | DEPENDS = "matchbox-panel-2" |
11 | SRCREV = "292" | 11 | SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945" |
12 | PV = "0.0+svnr${SRCPV}" | 12 | PV = "0.1+git${SRCPV}" |
13 | PR = "r2" | 13 | PR = "r0" |
14 | 14 | ||
15 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${BPN};proto=http \ | 15 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
16 | file://fix_ldadd_order.patch" | 16 | file://fix_ldadd_order.patch" |
17 | 17 | ||
18 | S = ${WORKDIR}/${BPN} | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit autotools pkgconfig | 20 | inherit autotools pkgconfig |
21 | 21 | ||
diff --git a/meta/recipes-sato/web/web-webkit_svn.bb b/meta/recipes-sato/web/web-webkit_git.bb index 2f79e0ad1c..2af12bc392 100644 --- a/meta/recipes-sato/web/web-webkit_svn.bb +++ b/meta/recipes-sato/web/web-webkit_git.bb | |||
@@ -11,15 +11,15 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" | |||
11 | # To access https web pages | 11 | # To access https web pages |
12 | RRECOMMENDS_${PN} += "glib-networking" | 12 | RRECOMMENDS_${PN} += "glib-networking" |
13 | 13 | ||
14 | SRCREV = "130" | 14 | SRCREV = "0f7019acd9db5383c732d0524c7c3a5eaec9be2b" |
15 | PV = "0.0+svnr${SRCPV}" | 15 | PV = "0.1+git${SRCPV}" |
16 | PR = "r4" | 16 | PR = "r0" |
17 | 17 | ||
18 | SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ | 18 | SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ |
19 | file://link-with-g++.patch \ | 19 | file://link-with-g++.patch \ |
20 | file://make-382.patch" | 20 | file://make-382.patch" |
21 | 21 | ||
22 | S = "${WORKDIR}/webkit" | 22 | S = "${WORKDIR}/git" |
23 | 23 | ||
24 | EXTRA_OECONF = "--enable-libowl" | 24 | EXTRA_OECONF = "--enable-libowl" |
25 | 25 | ||