| Submitter | Laurentiu Palcu |
|---|---|
| Date | Nov. 14, 2012, 9:28 a.m. |
| Message ID | <5467b530a59b1d698e8171b4a7c77104593dde40.1352884713.git.laurentiu.palcu@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/39003/ |
| State | New |
| Headers | show |
Comments
On Wed, Nov 14, 2012 at 11:28:09AM +0200, Laurentiu Palcu wrote: > Other changes: > * changed the recipe's SRC_URI to track the new (maintained) repo; > * removed all old patches as the latest driver's structure has changed > drastically; > * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed > by somebody with a better understanding of these things though); > * xf86-video-omapfb changed its name to xf86-video-omap: change the > recipe name acordingly; > * add dependency of libdrm-omap; > > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> > --- > ...-video-omapfb_git.bb => xf86-video-omap_git.bb} | 27 ++++++++++---------- > 1 file changed, 13 insertions(+), 14 deletions(-) > rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%) > > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > similarity index 43% > rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb > rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > index f16441e..fec3365 100644 > --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > @@ -6,19 +6,18 @@ DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ > framebuffer." > > LICENSE = "MIT-X & GPLv2+" > -LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" > -DEPENDS += "virtual/libx11" > - > -SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" > -PR = "${INC_PR}.6" > -PV = "0.1.1+gitr${SRCPV}" > - > -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ > - file://omap-revert-set-CRTC-limit.patch \ > - file://omap-revert-set-virtual-size.patch \ > - file://omap-force-plain-mode.patch \ > - file://omap-blacklist-tv-out.patch \ > - file://0004-Attempt-to-fix-VRFB.patch \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" > +DEPENDS += "virtual/libx11 libdrm-omap" Ah, now I see why you added them in libdrm PROVIDES, but why not use libdrm in DEPENDS and libdrm-omap added to RDEPENDS by shlibs? I also don't see GNUtoo comment resolved. Cheers, > +RPROVIDES = "xf86-video-omapfb" > +RCONFLICTS = "xf86-video-omapfb" > +RREPLACES = "xf86-video-omapfb" > + > +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" > +PR = "${INC_PR}.0" > +PV = "0.4.2+gitr${SRCPV}" > + > +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \ > " > > S = "${WORKDIR}/git" > @@ -28,5 +27,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg " > > # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) > do_compile_prepend_armv7a () { > - sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c > + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c > } > -- > 1.7.9.5 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On 11/14/2012 01:28 AM, Laurentiu Palcu wrote: > Other changes: > * changed the recipe's SRC_URI to track the new (maintained) repo; > * removed all old patches as the latest driver's structure has changed > drastically; > * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed > by somebody with a better understanding of these things though); > * xf86-video-omapfb changed its name to xf86-video-omap: change the > recipe name acordingly; > * add dependency of libdrm-omap; > > Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> > --- > ...-video-omapfb_git.bb => xf86-video-omap_git.bb} | 27 ++++++++++---------- > 1 file changed, 13 insertions(+), 14 deletions(-) > rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%) > > diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > similarity index 43% > rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb > rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > index f16441e..fec3365 100644 > --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb > +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb > @@ -6,19 +6,18 @@ DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ > framebuffer." > > LICENSE = "MIT-X & GPLv2+" If the license changed to GPLv2, then why is MIT-X still listed, if the MIT bits are gone the remove MIT here. > -LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" > -DEPENDS += "virtual/libx11" > - > -SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" > -PR = "${INC_PR}.6" > -PV = "0.1.1+gitr${SRCPV}" > - > -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ > - file://omap-revert-set-CRTC-limit.patch \ > - file://omap-revert-set-virtual-size.patch \ > - file://omap-force-plain-mode.patch \ > - file://omap-blacklist-tv-out.patch \ > - file://0004-Attempt-to-fix-VRFB.patch \ > +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" > +DEPENDS += "virtual/libx11 libdrm-omap" > + Why did you move LIC_FILES_CHKSUM and DEPENDS down here, they were in the correct location above. > +RPROVIDES = "xf86-video-omapfb" > +RCONFLICTS = "xf86-video-omapfb" > +RREPLACES = "xf86-video-omapfb" > + > +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" > +PR = "${INC_PR}.0" > +PV = "0.4.2+gitr${SRCPV}" > + > +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \ > " > > S = "${WORKDIR}/git" > @@ -28,5 +27,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg " > > # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) > do_compile_prepend_armv7a () { > - sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c > + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c > } >
On 11/14/2012 06:28 PM, Saul Wold wrote: > On 11/14/2012 01:28 AM, Laurentiu Palcu wrote: >> Other changes: >> * changed the recipe's SRC_URI to track the new (maintained) repo; >> * removed all old patches as the latest driver's structure has changed >> drastically; >> * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed >> by somebody with a better understanding of these things though); >> * xf86-video-omapfb changed its name to xf86-video-omap: change the >> recipe name acordingly; >> * add dependency of libdrm-omap; >> >> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> >> --- >> ...-video-omapfb_git.bb => xf86-video-omap_git.bb} | 27 ++++++++++---------- >> 1 file changed, 13 insertions(+), 14 deletions(-) >> rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%) >> >> diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb >> similarity index 43% >> rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb >> rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb >> index f16441e..fec3365 100644 >> --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb >> +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb >> @@ -6,19 +6,18 @@ DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ >> framebuffer." >> >> LICENSE = "MIT-X & GPLv2+" > If the license changed to GPLv2, then why is MIT-X still listed, if the > MIT bits are gone the remove MIT here. The v3 patchset had this already fixed. > >> -LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" >> -DEPENDS += "virtual/libx11" >> - >> -SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" >> -PR = "${INC_PR}.6" >> -PV = "0.1.1+gitr${SRCPV}" >> - >> -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ >> - file://omap-revert-set-CRTC-limit.patch \ >> - file://omap-revert-set-virtual-size.patch \ >> - file://omap-force-plain-mode.patch \ >> - file://omap-blacklist-tv-out.patch \ >> - file://0004-Attempt-to-fix-VRFB.patch \ >> +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" >> +DEPENDS += "virtual/libx11 libdrm-omap" >> + > Why did you move LIC_FILES_CHKSUM and DEPENDS down here, they were in > the correct location above. I didn't move anything. It's probably because the create-pull-request script did not give the right -M option to git format-patch. A -M10 would have shown the patch as expected. Anyway, you can ignore that now. The v3 patchset leaves xf86-video-omapfb in place. It just adds another recipe. Laurentiu > >> +RPROVIDES = "xf86-video-omapfb" >> +RCONFLICTS = "xf86-video-omapfb" >> +RREPLACES = "xf86-video-omapfb" >> + >> +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" >> +PR = "${INC_PR}.0" >> +PV = "0.4.2+gitr${SRCPV}" >> + >> +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \ >> " >> >> S = "${WORKDIR}/git" >> @@ -28,5 +27,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg " >> >> # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) >> do_compile_prepend_armv7a () { >> - sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c >> + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c >> } >>
Patch
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb similarity index 43% rename from meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb rename to meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb index f16441e..fec3365 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_git.bb @@ -6,19 +6,18 @@ DESCRIPTION = "omapfb driver supports the basic Texas Instruments OMAP \ framebuffer." LICENSE = "MIT-X & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f" -DEPENDS += "virtual/libx11" - -SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f" -PR = "${INC_PR}.6" -PV = "0.1.1+gitr${SRCPV}" - -SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \ - file://omap-revert-set-CRTC-limit.patch \ - file://omap-revert-set-virtual-size.patch \ - file://omap-force-plain-mode.patch \ - file://omap-blacklist-tv-out.patch \ - file://0004-Attempt-to-fix-VRFB.patch \ +LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" +DEPENDS += "virtual/libx11 libdrm-omap" + +RPROVIDES = "xf86-video-omapfb" +RCONFLICTS = "xf86-video-omapfb" +RREPLACES = "xf86-video-omapfb" + +SRCREV = "ae0394e687f1a77e966cf72f895da91840dffb8f" +PR = "${INC_PR}.0" +PV = "0.4.2+gitr${SRCPV}" + +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-omap;protocol=git \ " S = "${WORKDIR}/git" @@ -28,5 +27,5 @@ CFLAGS += " -I${STAGING_INCDIR}/xorg " # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) do_compile_prepend_armv7a () { - sed -i -e s:fb1:fb2:g ${S}/src/omapfb-xv.c + sed -i -e s:fb1:fb2:g ${S}/src/omap_xv.c }
Other changes: * changed the recipe's SRC_URI to track the new (maintained) repo; * removed all old patches as the latest driver's structure has changed drastically; * license file changed quite a bit: MIT -> GPLv2 (needs to be reviewed by somebody with a better understanding of these things though); * xf86-video-omapfb changed its name to xf86-video-omap: change the recipe name acordingly; * add dependency of libdrm-omap; Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> --- ...-video-omapfb_git.bb => xf86-video-omap_git.bb} | 27 ++++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) rename meta/recipes-graphics/xorg-driver/{xf86-video-omapfb_git.bb => xf86-video-omap_git.bb} (43%)