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.

Sign up for GitHub

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

Build windows deps for 64-bit #21

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Build windows deps for 64-bit #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
08b925d
Build windows deps for 64-bit
hatstand Jan 26, 2021
41e88a2
Remove CircleCI
hatstand Jan 26, 2021
958ba4c
Use an Ubuntu LTS
hatstand Jan 27, 2021
fe03e94
Configure 64-bit for pthreads
hatstand Jan 27, 2021
7cdd53b
Set non-interactive flag when install from apt
hatstand Jan 27, 2021
ac373ba
Update glib to 2.59.3
hatstand Jan 27, 2021
6f169b6
Set 64-bit compiler for Qt
hatstand Jan 27, 2021
4f63f5e
Compile for 64-bit with cmake
hatstand Jan 27, 2021
1af4cfe
Remove libplist and libgpod
hatstand Jan 27, 2021
5ced010
Fix glib stow with meson/ninja
hatstand Jan 27, 2021
0b2b296
Add Meson cross compile settings
hatstand Jan 27, 2021
6bf0ced
Fix meson detection of libintl
hatstand Jan 27, 2021
21e674d
Python2 required for libpsl
hatstand Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 0 additions & 100 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

18 changes: 13 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,38 @@ jobs:
build:
runs-on: ubuntu-18.04
container:
image: ubuntu:eoan
image: ubuntu:focal
steps:
- name: Accept EULAs
env:
DEBIAN_FRONTEND: interactive
DEBIAN_FRONTEND: noninteractive
DEBCONF_NONINTERACTIVE_SEEN: "true"
run: echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
- name: Install dependencies
env:
DEBIAN_FRONTEND: noninteractive
DEBCONF_NONINTERACTIVE_SEEN: "true"
run: >
apt-get update && apt-get install -y -q
autoconf
bison
build-essential
cmake
flex
gettext
git-core
intltool
libglib2.0-dev
libtool
meson
mingw-w64
ninja-build
nsis
pkg-config
protobuf-compiler
python
python-dev
python3
python3-setuptools
stow
sudo
texinfo
Expand All @@ -40,9 +48,9 @@ jobs:
wine-stable
yasm
- name: Configure Mingw for POSIX threads
run: update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
run: update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
- name: Configure Mingw for POSIX threads
run: update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
run: update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- name: Checkout
uses: actions/checkout@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions Toolchain-mingw32.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
SET(CMAKE_SYSTEM_NAME Windows)

# which compilers to use for C and C++
SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
SET(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)

# here is the target environment located
SET(CMAKE_FIND_ROOT_PATH /target )
Expand Down
11 changes: 6 additions & 5 deletions downloader/downloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
import sys
import urllib
import urllib.request

DOWNLOAD_URL = 'https://storage.googleapis.com/clementine-data.appspot.com/Build%20dependencies/'

Expand All @@ -18,7 +19,7 @@
('gettext-0.20.2.tar.xz', '0cf5f68338d5d941bbf9ac93b847310f'),
('glew-1.5.5.tar.bz2', '25afa3ff4cff7b67add612e148a54240'),
('glew-1.5.5-win32.zip', '48c8c982644ba11dfe94aaf756217eec'),
('glib-2.58.3.tar.xz', '8058c7bde846dcffe5fa453eca366d73'),
('glib-2.59.3.tar.xz', '9a06eb1a7143a17050b0b1abef2208e1'),
('glib-networking-2.54.1.tar.xz', '99867463f182c2767bce0c74bc9cc981'),
('gmp-6.2.0.tar.xz', 'a325e3f09e6d91e62101e59f9bda3ec1'),
('gnutls-3.6.13.tar.xz', 'bb1fe696a11543433785b4fc70ca225f'),
Expand Down Expand Up @@ -74,7 +75,7 @@ def Md5File(path):

file_hash = hashlib.md5()
try:
with open(path) as fh:
with open(path, 'rb') as fh:
while True:
chunk = fh.read(4096)
if len(chunk) == 0:
Expand Down Expand Up @@ -103,8 +104,8 @@ def DownloadFiles(flags):
if actual_md5_checksum != md5_checksum:
url = DOWNLOAD_URL + name

print 'Downloading %s...' % name
urllib.urlretrieve(url, path)
print('Downloading %s...' % name)
urllib.request.urlretrieve(url, path)
actual_md5_checksum = Md5File(path)

# If the checksum still didn't match the download must have failed.
Expand All @@ -113,7 +114,7 @@ def DownloadFiles(flags):
'Download failed - checksums do not match (got %s, expected %s)' %
(actual_md5_checksum, md5_checksum))

print 'All files are up-to-date'
print('All files are up-to-date')


def Main(argv):
Expand Down
16 changes: 5 additions & 11 deletions makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ flac=flac-1.3.3
gcrypt=libgcrypt-1.8.5
gettext=gettext-0.20.2
glew=glew-1.5.5
glib=glib-2.58.3
glib=glib-2.59.3
glibnetworking=glib-networking-2.54.1
gmp=gmp-6.2.0
gnutls=gnutls-3.6.13
gpgerror=libgpg-error-1.38
gpod=libgpod-0.8.0.3
gstbad=gst-plugins-bad-1.16.2
gstbase=gst-plugins-base-1.16.2
gstgood=gst-plugins-good-1.16.2
Expand All @@ -38,7 +37,6 @@ opus=opus-1.3.1
orc=orc-0.4.29
p11kit=p11-kit-0.23.2
pcre=pcre-8.44
plist=libplist-2.1.0
protobuf=protobuf-3.6.1
psl=libpsl-0.21.0
pthreads=pthreads-win32-2.8.0
Expand All @@ -60,10 +58,10 @@ zlib=zlib-1.2.11

allpackages= $(boost) $(cdio) ${chromaprint} $(curl) $(dlfcn) $(faad) ${ffi} \
$(fftw) $(flac) $(gcrypt) $(gettext) $(glew) $(glib) $(glibnetworking) \
${gmp} $(gnutls) $(gpgerror) $(gpod) $(gst) $(gstbad) $(gstbase) $(gstgood) \
${gmp} $(gnutls) $(gpgerror) $(gst) $(gstbad) $(gstbase) $(gstgood) \
$(gstlibav) $(gstugly) $(id3tag) $(lame) $(lastfm) ${libiconv} $(mms) $(mmswin32) \
$(mpcdec) $(mtp) ${nettle} $(ogg) $(oil) $(openssl) ${opus} $(orc) ${p11kit} \
$(pcre) $(plist) $(protobuf) ${psl} $(pthreads) $(qt) $(soup) ${sparsehash} \
$(pcre) $(protobuf) ${psl} $(pthreads) $(qt) $(soup) ${sparsehash} \
$(speex) $(spotifywin32) $(sqlite) $(taglib) $(tasn1) $(tls) ${unistring} \
$(vorbis) $(wavpack) ${win7sdk} $(xml) ${zlib}

Expand All @@ -89,7 +87,6 @@ glibtgz=$(downloads)/$(glib).tar.xz
gmptgz=$(downloads)/$(gmp).tar.xz
gnutlstgz=$(downloads)/$(gnutls).tar.xz
gpgerrortgz=$(downloads)/$(gpgerror).tar.bz2
gpodtgz=$(downloads)/$(gpod).tar.gz
gstbadtgz=$(downloads)/$(gstbad).tar.xz
gstbasetgz=$(downloads)/$(gstbase).tar.xz
gstgoodtgz=$(downloads)/$(gstgood).tar.xz
Expand All @@ -112,7 +109,6 @@ opustgz=$(downloads)/$(opus).tar.gz
orctgz=$(downloads)/$(orc).tar.xz
p11kittgz=$(downloads)/$(p11kit).tar.gz
pcretgz=${downloads}/${pcre}.tar.bz2
plisttgz=$(downloads)/$(plist).tar.gz
protobuftgz=$(downloads)/protobuf-cpp-3.6.1.tar.gz
psltgz=$(downloads)/$(psl).tar.gz
pthreadstgz=$(downloads)/$(pthreads).tar.gz
Expand All @@ -137,7 +133,7 @@ all:
$(MAKE) clementine-deps

clean:
realstow=`python -c "import os.path; print os.path.realpath('$(stow)')"`; \
realstow=`python3 -c "import os.path; print os.path.realpath('$(stow)')"`; \
for path in $(stow)/*; do \
directory=`basename $$path`; \
stow -d $$realstow -D $$directory; \
Expand All @@ -148,7 +144,7 @@ clean:
-rm .done-*

all-downloads:
python $(src)/downloader/downloader.py --output "$(downloads)"
python3 $(src)/downloader/downloader.py --output "$(downloads)"

boost: .done-boost
cdio: .done-cdio
Expand All @@ -175,12 +171,10 @@ id3tag: .done-id3tag
lame: .done-lame
libgnutls: .done-libgnutls
libgpgerror: .done-libgpgerror
libgpod: .done-libgpod
liblastfm: .done-liblastfm
libmms: .done-libmms
libmpcdec: .done-libmpcdec
libmtp: .done-libmtp
libplist: .done-libplist
libpsl: .done-libpsl
libsoup: .done-libsoup
libtasn1: .done-libtasn1
Expand Down
Loading