Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libdvbpsi: exhume 1.2.0, fix 1.3.0 versioning, drop static lib. #636

Merged
merged 1 commit into from Jun 16, 2016

Conversation

@fbrosson
Copy link
Member

fbrosson commented Jun 13, 2016

No description provided.

@fbrosson
Copy link
Member Author

fbrosson commented Jun 13, 2016

I did not manage to rename the lib to libdvbpsi12 so I had to add a CONFLICTS_devel.
Would it be OK to remove the CONFLICTS_devel and:

  • rename develop/headers/dvbpsi to develop/headers/dvbpsi12
  • rename lib/livdvbpsi.* to lib/livdvbpsi12.*
  • rename lib/pkgconfig/libdvbpsi.pc to lib/pkgconfig/libdvbpsi12.pc
  • update the paths and filenames in lib/libdvbpsi12.la and lib/pkgconfig/libdvbpsi12.pc

Or is it worthless?
Is there a standard way of doing this? I tried to see how libpng{12,16} handle this but could not figure out how it does.
Also, I tried to configure using --disable-static (or --enable-static=no) but none worked, so I just kept it. Would it be OK, though, to simply remove libdvbpsi.a ?

@pulkomandy
Copy link
Member

pulkomandy commented Jun 13, 2016

No, it is expected that we get conflicts on the devel package in this case.
In libpng case, the library is already renamed in each version so there are not too much problems.

In libdvbpsi, both versions of the lib have the same name, so you can have only one version of the dev package installed at the same time (this is safer, because we could also run into conflicts with the .h files, etc).

As long as the non-devel packages can be installed side by side, there is no problems. The devel package for the old version of the lib will only be used with haikuporter, and in that case there shouldn't be too much conflicts because the chroot used for building only has a small set of packages.

If you rename all the libs and .pc files, all projects using the lib would have to be modified. Since this is mostly dealing with legacy code (old version of VLC, etc), it would be a lot of work that no one would want to merge upstream.

@fbrosson fbrosson changed the title libdvbpsi: bring back version 1.2.0 as VLC 0.8.6i needs it. (WIP) libdvbpsi: bring back 1.2.0 and fix version info for 1.3.0. (WIP) Jun 13, 2016
@fbrosson
Copy link
Member Author

fbrosson commented Jun 13, 2016

OK, thanks a lot for your detailed reply.
I noticed I had made a second mistake! I had forgotten to update the versioning of {lib,devel}:libdvbpsi in the PROVIDES{,_devel} of libdvbpsi-1.3.0, so I'm fixing it in this PR.

@fbrosson fbrosson changed the title libdvbpsi: bring back 1.2.0 and fix version info for 1.3.0. (WIP) libdvbpsi: exhume 1.2.0, fix 1.3.0 versioning, drop static lib. Jun 15, 2016
@fbrosson fbrosson merged commit 91dd569 into haikuports:master Jun 16, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@fbrosson fbrosson deleted the fbrosson:libdvbpsi branch Jun 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.