Libshout intern #2040
Libshout intern #2040
Conversation
daschuer
force-pushed
the
libshout_intern
branch
from
ef74155
to
9986605
Compare
|
@uklotzde this branch is again relevant for fixing https://bugs.launchpad.net/mixxx/+bug/1833225 |
|
More and more users are effected as the buggy libshout version spreads the world: |
|
I'll test this tomorrow. Can you also add this to |
|
I would be happy if you care about the CMake integration. Thank you |
I'll do that later when the 2.2 branch has been merged into master again. |
|
I can report that this builds for me using SCons 3.1.1 when applying these patches: diff --git a/build/depends.py b/build/depends.py
index 9d5efa2293..1663efb8c2 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -1304,7 +1304,7 @@ class MixxxCore(Feature):
'preferences/dialog/dlgprefvinyldlg.ui',
'preferences/dialog/dlgprefwaveformdlg.ui',
]
- map(Qt.uic(build), ui_files)
+ list(map(Qt.uic(build), ui_files))
if build.platform_is_windows:
# Add Windows resource file with icons and such
diff --git a/build/features.py b/build/features.py
index 5fe3d24475..a68d94b31b 100644
--- a/build/features.py
+++ b/build/features.py
@@ -812,7 +812,7 @@ class LiveBroadcasting(Feature):
def add_options(self, build, vars):
vars.Add('shoutcast', 'Set to 1 to enable live broadcasting support', 1)
- vars.Add('shoutcast_internal', 'Set to 1 to use internal libshout', 1)
+ vars.Add('shoutcast_internal', 'Set to 1 to use internal libshout', 1)
def configure(self, build, conf):
if not self.enabled(build):I didn't try to actually start a live broadcast since I don't have a server, but since there aren't any actual code changes I guess it will work. |
|
We need a CMake integration before merging this. |
|
This is for 2.2, there is no CMakeLists.txt in the 2.2 branch. |
|
Is this a candidate for 2.2.3-rc2? Or will this go into 2.2.4/2.3.0? |
|
We are quite late to merge this in on one hand. On the other hand it is no new code essentially and it fixes broadcasting for users on effected OSs. So I am leaning to merge this. What do others think? |
|
Since this should only cause build-time issues (if any), we can do a late merge IMHO. But please fix the review comments first (without fixing the mixed spaces/tabs error, I cannot build mixxx anymore). |
|
This branch builds and Mixxx starts without issues. I can't test the libshout integration because I have no server, but since there are no business logic changes this should work. LGTM. |
|
Merge? |
|
Yes, but I a biased. |
|
I have restarted the macOS build. If it passes we could merge it. As far as I understand this should not have any side effects if you don't enable the new option explicitly. |
|
Yes, no side effect on MacOs and Windows. It should have the side effect Linux, that it defaults to the internal version, if the system provided version suffers the bug. |
|
Ok, so let's finally merge this and skip waiting for a successful Travis build. |
|
LGTM |
This PR adds libshout to the lib folder and uses it, if the systems libshout suffers
https://bugs.launchpad.net/mixxx/+bug/1833225
This will be also useful if we later switch to libshout-idjc. This way we can provide the patched library to distributions without idjc.