Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
257a77fa
Commit
257a77fa
authored
May 26, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
{android,win32}/build.py: build libmodplug and WildMidi
Closes
https://github.com/MusicPlayerDaemon/MPD/issues/866
parent
4e5d6e56
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
0 deletions
+75
-0
NEWS
NEWS
+2
-0
build.py
android/build.py
+2
-0
cmake.py
python/build/cmake.py
+45
-0
libs.py
python/build/libs.py
+24
-0
build.py
win32/build.py
+2
-0
No files found.
NEWS
View file @
257a77fa
...
...
@@ -8,8 +8,10 @@ ver 0.21.24 (not yet released)
- wildmidi: attempt to detect WildMidi using pkg-config
- wildmidi: fix Windows build failure
* Android
- enable the decoder plugins ModPlug and WildMidi
- fix build failure with Android NDK r21
* Windows
- enable the decoder plugins ModPlug and WildMidi
- work around Meson bug breaking the Windows build with GCC 10
* fix unit test failure
...
...
android/build.py
View file @
257a77fa
...
...
@@ -168,6 +168,8 @@ thirdparty_libs = [
opus
,
flac
,
libid3tag
,
libmodplug
,
wildmidi
,
ffmpeg
,
curl
,
libexpat
,
...
...
python/build/cmake.py
0 → 100644
View file @
257a77fa
import
subprocess
from
build.project
import
Project
def
configure
(
toolchain
,
src
,
build
,
args
=
()):
cross_args
=
[]
if
toolchain
.
is_windows
:
cross_args
.
append
(
'-DCMAKE_SYSTEM_NAME=Windows'
)
cross_args
.
append
(
'-DCMAKE_RC_COMPILER='
+
toolchain
.
windres
)
configure
=
[
'cmake'
,
src
,
'-DCMAKE_INSTALL_PREFIX='
+
toolchain
.
install_prefix
,
'-DCMAKE_BUILD_TYPE=release'
,
'-DCMAKE_C_COMPILER='
+
toolchain
.
cc
,
'-DCMAKE_CXX_COMPILER='
+
toolchain
.
cxx
,
'-DCMAKE_C_FLAGS='
+
toolchain
.
cflags
+
' '
+
toolchain
.
cppflags
,
'-DCMAKE_CXX_FLAGS='
+
toolchain
.
cxxflags
+
' '
+
toolchain
.
cppflags
,
'-GNinja'
,
]
+
cross_args
+
args
subprocess
.
check_call
(
configure
,
env
=
toolchain
.
env
,
cwd
=
build
)
class
CmakeProject
(
Project
):
def
__init__
(
self
,
url
,
md5
,
installed
,
configure_args
=
[],
**
kwargs
):
Project
.
__init__
(
self
,
url
,
md5
,
installed
,
**
kwargs
)
self
.
configure_args
=
configure_args
def
configure
(
self
,
toolchain
):
src
=
self
.
unpack
(
toolchain
)
build
=
self
.
make_build_path
(
toolchain
)
configure
(
toolchain
,
src
,
build
,
self
.
configure_args
)
return
build
def
build
(
self
,
toolchain
):
build
=
self
.
configure
(
toolchain
)
subprocess
.
check_call
([
'ninja'
,
'install'
],
cwd
=
build
,
env
=
toolchain
.
env
)
python/build/libs.py
View file @
257a77fa
...
...
@@ -4,6 +4,7 @@ from os.path import abspath
from
build.project
import
Project
from
build.zlib
import
ZlibProject
from
build.meson
import
MesonProject
from
build.cmake
import
CmakeProject
from
build.autotools
import
AutotoolsProject
from
build.ffmpeg
import
FfmpegProject
from
build.boost
import
BoostProject
...
...
@@ -111,6 +112,29 @@ liblame = AutotoolsProject(
],
)
libmodplug
=
AutotoolsProject
(
'https://downloads.sourceforge.net/modplug-xmms/libmodplug/0.8.9.0/libmodplug-0.8.9.0.tar.gz'
,
'457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de'
,
'lib/libmodplug.a'
,
[
'--disable-shared'
,
'--enable-static'
,
],
)
wildmidi
=
CmakeProject
(
'https://codeload.github.com/Mindwerks/wildmidi/tar.gz/wildmidi-0.4.3'
,
'498e5a96455bb4b91b37188ad6dcb070824e92c44f5ed452b90adbaec8eef3c5'
,
'lib/libWildMidi.a'
,
[
'-DBUILD_SHARED_LIBS=OFF'
,
'-DWANT_PLAYER=OFF'
,
'-DWANT_STATIC=ON'
,
],
base
=
'wildmidi-wildmidi-0.4.3'
,
name
=
'wildmidi'
,
version
=
'0.4.3'
,
)
ffmpeg
=
FfmpegProject
(
'http://ffmpeg.org/releases/ffmpeg-4.2.3.tar.xz'
,
'9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31'
,
...
...
win32/build.py
View file @
257a77fa
...
...
@@ -96,6 +96,8 @@ thirdparty_libs = [
zlib
,
libid3tag
,
liblame
,
libmodplug
,
wildmidi
,
ffmpeg
,
curl
,
libexpat
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment