| Submitter | Joshua Lock |
|---|---|
| Date | Nov. 8, 2011, 12:10 a.m. |
| Message ID | <484f22280e380ecdf10dc1bd6b89f69c37be1f68.1320709417.git.josh@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/14459/ |
| State | Accepted |
| Commit | acca04830aad1368f0a5cc2f48302cf272731174 |
| Headers | show |
Comments
On 11/07/2011 04:10 PM, Joshua Lock wrote: > Signed-off-by: Joshua Lock<josh@linux.intel.com> > --- > .../clutter/clutter-gst-1.8_1.4.2.bb | 22 ++++++++++++++++++++ > .../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++++++++++ > 2 files changed, 37 insertions(+), 0 deletions(-) > create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb > create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb > > diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb > new file mode 100644 > index 0000000..54b1fc1 > --- /dev/null > +++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb > @@ -0,0 +1,22 @@ > +require recipes-graphics/clutter/clutter-gst.inc > + > +PR = "r0" > + > +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ > + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" > + > +DEPENDS += "clutter-1.8 gstreamer" > +RDEPENDS_${PN} += "gst-meta-base" > + > +SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \ > + file://enable_tests-1.8.patch" > + We seem to be missing the enable_tests-1.8.patch file Sau! > +S = "${WORKDIR}/clutter-gst-${PV}" > + > +SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5" > +SRC_URI[sha256sum] = "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5" > + > +do_configure_prepend () { > + # Disable DOLT > + sed -i -e 's/^DOLT//' ${S}/configure.ac > +} > diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb > new file mode 100644 > index 0000000..35e60ca > --- /dev/null > +++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb > @@ -0,0 +1,15 @@ > +Install example binary needed for poky-image-clutter > + > +Signed-off-by: Zhai Edwin<edwin.zhai@intel.com> > +Index: clutter-gst-1.3.8/examples/Makefile.am > +=================================================================== > +--- clutter-gst-1.3.8.orig/examples/Makefile.am > ++++ clutter-gst-1.3.8/examples/Makefile.am > +@@ -1,6 +1,6 @@ > + NULL = # > + > +-noinst_PROGRAMS = video-player video-sink video-sink-navigation > ++bin_PROGRAMS = video-player video-sink video-sink-navigation > + > + INCLUDES = -I$(top_srcdir) \ > + $(MAINTAINER_CFLAGS) \
On 08/11/11 08:10, Saul Wold wrote: > On 11/07/2011 04:10 PM, Joshua Lock wrote: >> Signed-off-by: Joshua Lock<josh@linux.intel.com> >> --- >> .../clutter/clutter-gst-1.8_1.4.2.bb | 22 >> ++++++++++++++++++++ >> .../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++++++++++ >> 2 files changed, 37 insertions(+), 0 deletions(-) >> create mode 100644 >> meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >> create mode 100644 >> meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >> >> diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >> b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >> new file mode 100644 >> index 0000000..54b1fc1 >> --- /dev/null >> +++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >> @@ -0,0 +1,22 @@ >> +require recipes-graphics/clutter/clutter-gst.inc >> + >> +PR = "r0" >> + >> +LIC_FILES_CHKSUM = >> "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ >> + >> file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" >> >> + >> +DEPENDS += "clutter-1.8 gstreamer" >> +RDEPENDS_${PN} += "gst-meta-base" >> + >> +SRC_URI = >> "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 >> \ >> + file://enable_tests-1.8.patch" >> + > We seem to be missing the enable_tests-1.8.patch file It's further down this email, and in master: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b Joshua > Sau! > > >> +S = "${WORKDIR}/clutter-gst-${PV}" >> + >> +SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5" >> +SRC_URI[sha256sum] = >> "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5" >> + >> +do_configure_prepend () { >> + # Disable DOLT >> + sed -i -e 's/^DOLT//' ${S}/configure.ac >> +} >> diff --git >> a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >> b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >> new file mode 100644 >> index 0000000..35e60ca >> --- /dev/null >> +++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >> @@ -0,0 +1,15 @@ >> +Install example binary needed for poky-image-clutter >> + >> +Signed-off-by: Zhai Edwin<edwin.zhai@intel.com> >> +Index: clutter-gst-1.3.8/examples/Makefile.am >> +=================================================================== >> +--- clutter-gst-1.3.8.orig/examples/Makefile.am >> ++++ clutter-gst-1.3.8/examples/Makefile.am >> +@@ -1,6 +1,6 @@ >> + NULL = # >> + >> +-noinst_PROGRAMS = video-player video-sink video-sink-navigation >> ++bin_PROGRAMS = video-player video-sink video-sink-navigation >> + >> + INCLUDES = -I$(top_srcdir) \ >> + $(MAINTAINER_CFLAGS) \
On 11/08/2011 08:30 AM, Joshua Lock wrote: > > > On 08/11/11 08:10, Saul Wold wrote: >> On 11/07/2011 04:10 PM, Joshua Lock wrote: >>> Signed-off-by: Joshua Lock<josh@linux.intel.com> >>> --- >>> .../clutter/clutter-gst-1.8_1.4.2.bb | 22 >>> ++++++++++++++++++++ >>> .../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++++++++++ >>> 2 files changed, 37 insertions(+), 0 deletions(-) >>> create mode 100644 >>> meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>> create mode 100644 >>> meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >>> >>> diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>> b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>> new file mode 100644 >>> index 0000000..54b1fc1 >>> --- /dev/null >>> +++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>> @@ -0,0 +1,22 @@ >>> +require recipes-graphics/clutter/clutter-gst.inc >>> + >>> +PR = "r0" >>> + >>> +LIC_FILES_CHKSUM = >>> "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ >>> + >>> file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" >>> >>> + >>> +DEPENDS += "clutter-1.8 gstreamer" >>> +RDEPENDS_${PN} += "gst-meta-base" >>> + >>> +SRC_URI = >>> "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 >>> \ >>> + file://enable_tests-1.8.patch" >>> + >> We seem to be missing the enable_tests-1.8.patch file > > It's further down this email, and in master: > http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b > I see an enable-tests-1.8.bb file, but not the enable-tests-1.8.patch git checkout oe-core Switched to branch 'oe-core' [sgw@swold-mobl distro]$ find meta* -name enable_test* meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch - No 1.8.patch meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb Should this be a .patch file not a .bb file? meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch meta/recipes-graphics/clutter/clutter/enable_tests.patch meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch > Joshua > >> Sau! >> >> >>> +S = "${WORKDIR}/clutter-gst-${PV}" >>> + >>> +SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5" >>> +SRC_URI[sha256sum] = >>> "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5" >>> + >>> +do_configure_prepend () { >>> + # Disable DOLT >>> + sed -i -e 's/^DOLT//' ${S}/configure.ac >>> +} >>> diff --git >>> a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >>> b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >>> new file mode 100644 >>> index 0000000..35e60ca >>> --- /dev/null >>> +++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >>> @@ -0,0 +1,15 @@ >>> +Install example binary needed for poky-image-clutter >>> + >>> +Signed-off-by: Zhai Edwin<edwin.zhai@intel.com> >>> +Index: clutter-gst-1.3.8/examples/Makefile.am >>> +=================================================================== >>> +--- clutter-gst-1.3.8.orig/examples/Makefile.am >>> ++++ clutter-gst-1.3.8/examples/Makefile.am >>> +@@ -1,6 +1,6 @@ >>> + NULL = # >>> + >>> +-noinst_PROGRAMS = video-player video-sink video-sink-navigation >>> ++bin_PROGRAMS = video-player video-sink video-sink-navigation >>> + >>> + INCLUDES = -I$(top_srcdir) \ >>> + $(MAINTAINER_CFLAGS) \ >
On 08/11/11 08:54, Saul Wold wrote: > On 11/08/2011 08:30 AM, Joshua Lock wrote: >> >> >> On 08/11/11 08:10, Saul Wold wrote: >>> On 11/07/2011 04:10 PM, Joshua Lock wrote: >>>> Signed-off-by: Joshua Lock<josh@linux.intel.com> >>>> --- >>>> .../clutter/clutter-gst-1.8_1.4.2.bb | 22 >>>> ++++++++++++++++++++ >>>> .../clutter/clutter-gst/enable_tests-1.8.bb | 15 >>>> +++++++++++++ >>>> 2 files changed, 37 insertions(+), 0 deletions(-) >>>> create mode 100644 >>>> meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>>> create mode 100644 >>>> meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb >>>> >>>> diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>>> b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>>> new file mode 100644 >>>> index 0000000..54b1fc1 >>>> --- /dev/null >>>> +++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb >>>> @@ -0,0 +1,22 @@ >>>> +require recipes-graphics/clutter/clutter-gst.inc >>>> + >>>> +PR = "r0" >>>> + >>>> +LIC_FILES_CHKSUM = >>>> "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ >>>> + >>>> file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" >>>> >>>> >>>> + >>>> +DEPENDS += "clutter-1.8 gstreamer" >>>> +RDEPENDS_${PN} += "gst-meta-base" >>>> + >>>> +SRC_URI = >>>> "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 >>>> >>>> \ >>>> + file://enable_tests-1.8.patch" >>>> + >>> We seem to be missing the enable_tests-1.8.patch file >> >> It's further down this email, and in master: >> http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b >> >> > I see an enable-tests-1.8.bb file, but not the enable-tests-1.8.patc > > git checkout oe-core > Switched to branch 'oe-core' > [sgw@swold-mobl distro]$ find meta* -name enable_test* > meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch > > - No 1.8.patch > > meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch > meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb > > Should this be a .patch file not a .bb file? Well that's embarrassing, no idea how I managed that. Patch incoming. Joshua
Patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file mode 100644 index 0000000..54b1fc1 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb @@ -0,0 +1,22 @@ +require recipes-graphics/clutter/clutter-gst.inc + +PR = "r0" + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +DEPENDS += "clutter-1.8 gstreamer" +RDEPENDS_${PN} += "gst-meta-base" + +SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \ + file://enable_tests-1.8.patch" + +S = "${WORKDIR}/clutter-gst-${PV}" + +SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5" +SRC_URI[sha256sum] = "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5" + +do_configure_prepend () { + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file mode 100644 index 0000000..35e60ca --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb @@ -0,0 +1,15 @@ +Install example binary needed for poky-image-clutter + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> +Index: clutter-gst-1.3.8/examples/Makefile.am +=================================================================== +--- clutter-gst-1.3.8.orig/examples/Makefile.am ++++ clutter-gst-1.3.8/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink video-sink-navigation + + INCLUDES = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \
Signed-off-by: Joshua Lock <josh@linux.intel.com> --- .../clutter/clutter-gst-1.8_1.4.2.bb | 22 ++++++++++++++++++++ .../clutter/clutter-gst/enable_tests-1.8.bb | 15 +++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb