Bug 1421055 (deepin-cogl)

This package should not conflict with the original cogl.

Is it that bad if it conflicts with the original cogl? It provides the same functions, with two additions for deepin.

SPEC:  https://copr-be.cloud.fedoraproject.org/results/mosquito/deepin/fedora-26-x86_64/00596540-deepin-cogl/deepin-cogl.spec
SRPM:  https://copr-be.cloud.fedoraproject.org/results/mosquito/deepin/fedora-26-x86_64/00596540-deepin-cogl/deepin-cogl-1.22.5-2.fc26.src.rpm

- remove the 'conflicts' and 'obsoletes' tag

It's mostly the same as the original cogl. I don't want anyone who doesn't use deepin to update it. So what should i do with it?

Since version of deepin-cogl is greater than cogl, anybody runs 'dnf install cogl' will actually install deepin-cogl. Also applies to pungi.

@mosquito: I've discussed this with other packagers on IRC and the conclusion was it's best to rename it in order to avoid any conflict with the original cogl.

Upstream has not free time for this. I think the best way is use another path to save libraries and header files.

Is this package really needed? The diff between gnome's cogl 1.22 and this fork is just a few commits. Wouldn't it be possible to cooperate with Fedora cogl maintainers and cogl upstream to upstream those patches and dispose of the fork:

Only in deepin-cogl cogl-1.22 branch:
* 1e1e1b8a97 winsys: Disable sync_control
* f28fe60db1 Add LICENSE
* 9ee8ef2d2d (tag: 1.22.3) Change debian dir
* a34f7835c0 Debian dir migration
* 9e113c10da Add debian dir
* d8b34ab060 texture: Support copy_sub_image
* 78636289b0 Add GL_ARB_shader_texture_lod support

Only in upstream cogl cogl-1.22 branch:
* cbdde65b7e (upstream/cogl-1.22) Add Nepali translation
* 84d9ed33ef Update Malayalam translation
* 811f285a8e Update po/Makevars
* 3baa2d7a65 Updated Norwegian bokmål translation.
* 0bc94d13df Update Friulian translation
* cdb3229f54 Update Friulian translation
* df29d85990 Add Friulian translation
* b583e21d86 Fix an incorrect preprocessor conditional

@pbrobinson, what do you think?

(In reply to Zbigniew Jędrzejewski-Szmek from comment #7)
> * 9ee8ef2d2d (tag: 1.22.3) Change debian dir
> * a34f7835c0 Debian dir migration
> * 9e113c10da Add debian dir

@mosquito, can you try how this works if we manually create the dir as the commit above?

> @pbrobinson, what do you think?

I see Peter is not copied into the bug, so adding him to cc.

(In reply to Zbigniew Jędrzejewski-Szmek from comment #7)
> Is this package really needed? The diff between gnome's cogl 1.22 and this
> fork is just a few commits. Wouldn't it be possible to cooperate with Fedora
> cogl maintainers and cogl upstream to upstream those patches and dispose of
> the fork:
> 
> Only in deepin-cogl cogl-1.22 branch:
> * 1e1e1b8a97 winsys: Disable sync_control
> * f28fe60db1 Add LICENSE
> * 9ee8ef2d2d (tag: 1.22.3) Change debian dir
> * a34f7835c0 Debian dir migration
> * 9e113c10da Add debian dir
> * d8b34ab060 texture: Support copy_sub_image
> * 78636289b0 Add GL_ARB_shader_texture_lod support
> 
> Only in upstream cogl cogl-1.22 branch:
> * cbdde65b7e (upstream/cogl-1.22) Add Nepali translation
> * 84d9ed33ef Update Malayalam translation
> * 811f285a8e Update po/Makevars
> * 3baa2d7a65 Updated Norwegian bokmål translation.
> * 0bc94d13df Update Friulian translation
> * cdb3229f54 Update Friulian translation
> * df29d85990 Add Friulian translation
> * b583e21d86 Fix an incorrect preprocessor conditional
> 
> @pbrobinson, what do you think?

Yes, absolutely, having overlapping libraries is ridiculous.

Also looking at the 7 patches in deepin-cogl listed above there's probably only two that actually would affect Fedora, the top 5 listed commits are debian/windows/licence related, it's likely only the bottom two of real effect to Fedora and those should go for review upstream (well they all should).

Only the following two patches are required for Cogl.

https://github.com/linuxdeepin/deepin-cogl/commit/78636289b073d67209a20145ef0dc003f2d77db6    Add GL_ARB_shader_texture_lod support
https://github.com/linuxdeepin/deepin-cogl/commit/d8b34ab0604d80d0be22b8b78e9aa6bf4fac7db0    texture: Support copy_sub_image

and then the `clutter` needs following patch.

https://github.com/sonald/clutter/commit/0e6e542a05e071791ca625d08f8efa8111a347db     Support actors(blur) to be always redrawn

I asked the developer of Deepin why didn't submit these patches to upstream, and he said: "upstream does not merge the patches they doesn't need use".
@Peter Robinson could you help me?

(In reply to sensor.wen from comment #10)
> Only the following two patches are required for Cogl.
> 
> https://github.com/linuxdeepin/deepin-cogl/commit/
> 78636289b073d67209a20145ef0dc003f2d77db6    Add GL_ARB_shader_texture_lod
> support
> https://github.com/linuxdeepin/deepin-cogl/commit/
> d8b34ab0604d80d0be22b8b78e9aa6bf4fac7db0    texture: Support copy_sub_image
> 
> and then the `clutter` needs following patch.
> 
> https://github.com/sonald/clutter/commit/
> 0e6e542a05e071791ca625d08f8efa8111a347db     Support actors(blur) to be
> always redrawn

We need upstream bugs for both (cogl/clutter) and then link those to downstream bugs against the appropriate Fedora components, close off this request as it's not the place to deal with it.

> I asked the developer of Deepin why didn't submit these patches to upstream,
> and he said: "upstream does not merge the patches they doesn't need use".
> @Peter Robinson could you help me?

I don't believe that to be true, and it's certainly not been my experience.

(In reply to Peter Robinson from comment #11)
> (In reply to sensor.wen from comment #10)
> > Only the following two patches are required for Cogl.
> > 
> > https://github.com/linuxdeepin/deepin-cogl/commit/
> > 78636289b073d67209a20145ef0dc003f2d77db6    Add GL_ARB_shader_texture_lod
> > support
> > https://github.com/linuxdeepin/deepin-cogl/commit/
> > d8b34ab0604d80d0be22b8b78e9aa6bf4fac7db0    texture: Support copy_sub_image
> > 
> > and then the `clutter` needs following patch.
> > 
> > https://github.com/sonald/clutter/commit/
> > 0e6e542a05e071791ca625d08f8efa8111a347db     Support actors(blur) to be
> > always redrawn
> 
> We need upstream bugs for both (cogl/clutter) and then link those to
> downstream bugs against the appropriate Fedora components, close off this
> request as it's not the place to deal with it.
> 
> > I asked the developer of Deepin why didn't submit these patches to upstream,
> > and he said: "upstream does not merge the patches they doesn't need use".
> > @Peter Robinson could you help me?
> 
> I don't believe that to be true, and it's certainly not been my experience.

Thanks @Peter Robinson.
I try to create new upstream bugs for both on Github.

> Thanks @Peter Robinson.
> I try to create new upstream bugs for both on Github.

I suspect you'll need bugzilla.gnome.org rather than github

(In reply to Peter Robinson from comment #13)
> > Thanks @Peter Robinson.
> > I try to create new upstream bugs for both on Github.
> 
> I suspect you'll need bugzilla.gnome.org rather than github

https://bugzilla.gnome.org/show_bug.cgi?id=787443

I submitted new upstream bug for this. But I can't provide much information about patches. If you find out some problem, i will tell the developer.

Hi, @Peter

Cogl patches are approved on the upstream, but new versions are not available.  May be we need to attach them to cogl package.

https://bugzilla.gnome.org/show_bug.cgi?id=787443#c8

(In reply to sensor.wen from comment #15)
> Hi, @Peter
> 
> Cogl patches are approved on the upstream, but new versions are not
> available.  May be we need to attach them to cogl package.
> 
> https://bugzilla.gnome.org/show_bug.cgi?id=787443#c8

Bowen, 
See comment 11. I suggest file a bug asking the cogl maintainers to add them after the patches landed in cogl git repo.

> Cogl patches are approved on the upstream, but new versions are not
> available.  May be we need to attach them to cogl package.

Saw that, I'm traveling and in meetings all week so I won't have time to look closely for a bit but if you could give me a PR [1] I can merge/push a build this week.

[1] https://src.fedoraproject.org/rpms/cogl

I submitted a new Pull Request for cogl. It looks good. @Peter

https://src.fedoraproject.org/rpms/cogl/pull-request/1

It's FBTFS, looks like there's a new dependency.

https://koji.fedoraproject.org/koji/taskinfo?taskID=22126976

Added the pkgconfig(egl) BReq. Build passed. @Peter

PR: https://src.fedoraproject.org/rpms/cogl/pull-request/2

Test: https://koji.fedoraproject.org/koji/taskinfo?taskID=22219077

cogl-1.22.2-7.fc27 has been submitted as an update to Fedora 27. https://bodhi.fedoraproject.org/updates/FEDORA-2017-1bad42b7b7

cogl-1.22.2-7.fc27 has been pushed to the Fedora 27 testing repository. If problems still persist, please make note of it in this bug report.
See https://fedoraproject.org/wiki/QA:Updates_Testing for
instructions on how to install test updates.
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2017-1bad42b7b7

cogl-1.22.2-7.fc27 has been pushed to the Fedora 27 stable repository. If problems still persist, please make note of it in this bug report.